diff --git a/bootstrap.sh b/bootstrap.sh
index 489a4675a76..34ba0c30e90 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -136,7 +136,7 @@ function install_grpc() {
   grpcio_ver=$version
   $PIP install --upgrade grpcio=="$grpcio_ver" grpcio-tools=="$grpcio_ver"
 }
-install_dep "gRPC" "1.10.0" "$VTROOT/dist/grpc" install_grpc
+install_dep "gRPC" "1.16.0" "$VTROOT/dist/grpc" install_grpc
 
 
 # Install protoc.
@@ -153,7 +153,7 @@ function install_protoc() {
   unzip "protoc-$version-$platform-x86_64.zip"
   ln -snf "$dist/bin/protoc" "$VTROOT/bin/protoc"
 }
-protoc_ver=3.5.1
+protoc_ver=3.6.1
 install_dep "protoc" "$protoc_ver" "$VTROOT/dist/vt-protoc-$protoc_ver" install_protoc
 
 
@@ -169,11 +169,11 @@ function install_zookeeper() {
   cp "$zk/contrib/fatjar/$zk-fatjar.jar" lib
   # TODO(sougou): when version changes, see if we can drop the 'zip -d' hack to get the fatjars working.
   #               If yes, also delete "zip" from the Dockerfile files and the manual build instructions again.
-  # 3.4.10 workaround: Delete META-INF files which should not be in there.
+  # 3.4.13 workaround: Delete META-INF files which should not be in there.
   zip -d "lib/$zk-fatjar.jar" 'META-INF/*.SF' 'META-INF/*.RSA' 'META-INF/*SF'
   rm -rf "$zk" "$zk.tar.gz"
 }
-zk_ver=3.4.10
+zk_ver=3.4.13
 install_dep "Zookeeper" "$zk_ver" "$VTROOT/dist/vt-zookeeper-$zk_ver" install_zookeeper
 
 
@@ -190,7 +190,7 @@ function install_etcd() {
   rm "$tar_file"
   ln -snf "$dist/etcd-${version}-linux-amd64/etcd" "$VTROOT/bin/etcd"
 }
-install_dep "etcd" "v3.1.0-rc.1" "$VTROOT/dist/etcd" install_etcd
+install_dep "etcd" "v3.3.10" "$VTROOT/dist/etcd" install_etcd
 
 
 # Download and install consul, link consul binary into our root.
@@ -203,7 +203,7 @@ function install_consul() {
   unzip "consul_${version}_linux_amd64.zip"
   ln -snf "$dist/consul" "$VTROOT/bin/consul"
 }
-install_dep "Consul" "1.0.6" "$VTROOT/dist/consul" install_consul
+install_dep "Consul" "1.4.0" "$VTROOT/dist/consul" install_consul
 
 
 # Install py-mock.
@@ -251,7 +251,7 @@ function install_chromedriver() {
   unzip -o -q chromedriver_linux64.zip -d "$dist"
   rm chromedriver_linux64.zip
 }
-install_dep "chromedriver" "2.40" "$VTROOT/dist/chromedriver" install_chromedriver
+install_dep "chromedriver" "2.44" "$VTROOT/dist/chromedriver" install_chromedriver
 
 
 #
diff --git a/config/mycnf/default-fast.cnf b/config/mycnf/default-fast.cnf
index ec7f92595f8..3b732fdc6df 100644
--- a/config/mycnf/default-fast.cnf
+++ b/config/mycnf/default-fast.cnf
@@ -22,7 +22,6 @@ innodb_log_file_size = 1M
 innodb_log_files_in_group = 2
 innodb_log_group_home_dir = {{.InnodbLogGroupHomeDir}}
 innodb_max_dirty_pages_pct = 75
-innodb_support_xa = 0
 innodb_thread_concurrency = 2
 key_buffer_size = 2M
 log-error = {{.ErrorLogPath}}
@@ -37,7 +36,6 @@ port = {{.MysqlPort}}
 read-only
 read_buffer_size = 1M
 read_rnd_buffer_size = 1M
-secure_file_priv = NULL
 server-id = {{.ServerID}}
 skip-name-resolve
 # we now need networking for replication. this is a tombstone to simpler times.
diff --git a/config/mycnf/default.cnf b/config/mycnf/default.cnf
index 59177071ca8..cb6711d3fa7 100644
--- a/config/mycnf/default.cnf
+++ b/config/mycnf/default.cnf
@@ -26,17 +26,16 @@ innodb_thread_concurrency = 20
 key_buffer_size = 32M
 log-error = {{.ErrorLogPath}}
 long_query_time = 2
-max_allowed_packet = 16M
-max_connections = 100
+max_allowed_packet = 64M
+max_connections = 500
 net_write_timeout = 60
 pid-file = {{.PidFile}}
 port = {{.MysqlPort}}
 # all db instances should start in read-only mode - once the db is started and
 # fully functional, we'll push it into read-write mode
 read-only
-read_buffer_size = 1M
-read_rnd_buffer_size = 1M
-secure_file_priv = NULL
+read_buffer_size = 8M
+read_rnd_buffer_size = 8M
 server-id = {{.ServerID}}
 skip-name-resolve
 # all db instances should skip the slave startup - that way we can do any
diff --git a/config/mycnf/master_mysql56.cnf b/config/mycnf/master_mysql56.cnf
index 2c802b2332a..a3d1004a916 100644
--- a/config/mycnf/master_mysql56.cnf
+++ b/config/mycnf/master_mysql56.cnf
@@ -4,6 +4,8 @@ gtid_mode = ON
 log_bin
 log_slave_updates
 enforce_gtid_consistency
+secure_file_priv = NULL
+innodb_support_xa = 0
 
 # Crash-safe replication settings.
 master_info_repository = TABLE
diff --git a/config/mycnf/production.cnf b/config/mycnf/production.cnf
new file mode 100644
index 00000000000..64f8c245035
--- /dev/null
+++ b/config/mycnf/production.cnf
@@ -0,0 +1,5 @@
+# Values for a production vitess deployment
+innodb_buffer_pool_size = 1024M
+innodb_log_file_size = 512M
+innodb_log_buffer_size = 64M
+max_connections = 1000
\ No newline at end of file
diff --git a/data/test/vtgate/dml_cases.txt b/data/test/vtgate/dml_cases.txt
index 926b934edf2..8de0a71d9c2 100644
--- a/data/test/vtgate/dml_cases.txt
+++ b/data/test/vtgate/dml_cases.txt
@@ -1306,6 +1306,21 @@
   }
 }
 
+# update with target destination
+"update `user[-]`.user_extra set val = 1"
+{
+  "Original": "update `user[-]`.user_extra set val = 1",
+  "Instructions": {
+    "Opcode": "UpdateByDestination",
+    "Keyspace": {
+      "Name": "user",
+      "Sharded": true
+    },
+    "Query": "update user_extra set val = 1",
+    "Table": "user_extra"
+  }
+}
+
 # update with no primary vindex on where clause (scatter update)   - multi shard autocommit
 "update /*vt+ MULTI_SHARD_AUTOCOMMIT=1 */  user_extra set val = 1"
 {
diff --git a/data/test/vtgate/unsupported_cases.txt b/data/test/vtgate/unsupported_cases.txt
index a2e4049a5aa..af1cb7af617 100644
--- a/data/test/vtgate/unsupported_cases.txt
+++ b/data/test/vtgate/unsupported_cases.txt
@@ -39,10 +39,6 @@
 "select * from `user[-]`.user_metadata"
 "unsupported: SELECT with a target destination"
 
-# Unsupported UPDATE statement with a target destination
-"update `user[-]`.user_metadata set id=2"
-"unsupported: UPDATE with a target destination"
-
 # Unsupported INSERT statement with a target destination
 "insert into `user[-]`.user_metadata (a, b) values (1,2)"
 "unsupported: INSERT with a target destination"
@@ -51,6 +47,10 @@
 "DELETE FROM `user[-]@replica`.user_metadata limit 1"
 "unsupported: DELETE statement with a replica target"
 
+# Unsupported UPDATE statement with a replica target destination
+"update `user[-]@replica`.user_metadata set id=2"
+"unsupported: UPDATE statement with a replica target"
+
 # order by on a cross-shard subquery
 "select id from (select user.id, user.col from user join user_extra) as t order by id"
 "unsupported: cannot order by on a cross-shard subquery"
diff --git a/doc/GettingStarted.md b/doc/GettingStarted.md
index 46142b13b2b..65745febb7b 100644
--- a/doc/GettingStarted.md
+++ b/doc/GettingStarted.md
@@ -117,7 +117,7 @@ In addition, Vitess requires the software and libraries listed below.
 4.  Select a lock service from the options listed below. It is technically
     possible to use another lock server, but plugins currently exist only
     for ZooKeeper, etcd and consul.
-    - ZooKeeper 3.4.10 is included by default. 
+    - ZooKeeper 3.4.13 is included by default. 
     - [Install etcd v3.0+](https://github.com/coreos/etcd/releases).
       If you use etcd, remember to include the `etcd` command
       on your path.
diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common
index df663fe95bd..8db6dd15d5c 100644
--- a/docker/bootstrap/Dockerfile.common
+++ b/docker/bootstrap/Dockerfile.common
@@ -1,4 +1,4 @@
-FROM golang:1.10
+FROM golang:1.11
 
 # Install Vitess build dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/docker/bootstrap/Dockerfile.mysql56 b/docker/bootstrap/Dockerfile.mysql56
index eebb7807f62..56fd5dba41b 100644
--- a/docker/bootstrap/Dockerfile.mysql56
+++ b/docker/bootstrap/Dockerfile.mysql56
@@ -1,7 +1,7 @@
 FROM vitess/bootstrap:common
 
 # Install MySQL 5.6
-RUN for i in $(seq 1 10); do apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net 5072E1F5 && break; done && \
+RUN for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver pool.sks-keyservers.net 5072E1F5 && break; done && \
     add-apt-repository 'deb http://repo.mysql.com/apt/debian/ stretch mysql-5.6' && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server libmysqlclient-dev && \
diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57
index 514b63b441c..c4c7f5c6660 100644
--- a/docker/bootstrap/Dockerfile.mysql57
+++ b/docker/bootstrap/Dockerfile.mysql57
@@ -1,7 +1,7 @@
 FROM vitess/bootstrap:common
 
 # Install MySQL 5.7
-RUN for i in $(seq 1 10); do apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net 5072E1F5 && break; done && \
+RUN for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver ha.pool.sks-keyservers.net 5072E1F5 && break; done && \
     add-apt-repository 'deb http://repo.mysql.com/apt/debian/ stretch mysql-5.7' && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server libmysqlclient-dev && \
diff --git a/docker/bootstrap/Dockerfile.percona b/docker/bootstrap/Dockerfile.percona
index 9cad25dec48..422dacffb6b 100644
--- a/docker/bootstrap/Dockerfile.percona
+++ b/docker/bootstrap/Dockerfile.percona
@@ -1,7 +1,7 @@
 FROM vitess/bootstrap:common
 
 # Install Percona 5.6
-RUN for i in $(seq 1 10); do apt-key adv --keyserver keys.gnupg.net --recv-keys 8507EFA5 && break; done && \
+RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keys.gnupg.net --recv-keys 8507EFA5 && break; done && \
     add-apt-repository 'deb http://repo.percona.com/apt stretch main' && \
     { \
         echo debconf debconf/frontend select Noninteractive; \
diff --git a/docker/bootstrap/Dockerfile.percona57 b/docker/bootstrap/Dockerfile.percona57
index 22a743525cf..054e0d3216a 100644
--- a/docker/bootstrap/Dockerfile.percona57
+++ b/docker/bootstrap/Dockerfile.percona57
@@ -1,7 +1,7 @@
 FROM vitess/bootstrap:common
 
 # Install Percona 5.7
-RUN for i in $(seq 1 10); do apt-key adv --keyserver keys.gnupg.net --recv-keys 8507EFA5 && break; done && \
+RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keys.gnupg.net --recv-keys 8507EFA5 && break; done && \
     add-apt-repository 'deb http://repo.percona.com/apt stretch main' && \
     { \
         echo debconf debconf/frontend select Noninteractive; \
diff --git a/docker/k8s/pmm-client/Dockerfile b/docker/k8s/pmm-client/Dockerfile
index 5e5fa4f800e..5c81f180728 100644
--- a/docker/k8s/pmm-client/Dockerfile
+++ b/docker/k8s/pmm-client/Dockerfile
@@ -4,12 +4,11 @@ FROM debian:stretch-slim
 
 RUN apt-get update && \
    apt-get upgrade -qq && \
-   apt-get install -y procps && \
-   apt-get install wget -qq --no-install-recommends && \
-   wget https://www.percona.com/redir/downloads/pmm-client/1.15.0/binary/debian/stretch/x86_64/pmm-client_1.15.0-1.stretch_amd64.deb && \
-   dpkg -i pmm-client_1.15.0-1.stretch_amd64.deb && \
-   rm pmm-client_1.15.0-1.stretch_amd64.deb && \
-   apt-get purge wget -qq && \
+   apt-get install procps wget ca-certificates -qq --no-install-recommends && \
+   wget https://www.percona.com/redir/downloads/pmm-client/1.17.0/binary/debian/stretch/x86_64/pmm-client_1.17.0-1.stretch_amd64.deb && \
+   dpkg -i pmm-client_1.17.0-1.stretch_amd64.deb && \
+   rm pmm-client_1.17.0-1.stretch_amd64.deb && \
+   apt-get purge wget ca-certificates -qq && \
    apt-get autoremove -qq && \
    apt-get clean && \
    rm -rf /var/lib/apt/lists/*
diff --git a/docker/lite/Dockerfile.alpine b/docker/lite/Dockerfile.alpine
index 4a79ab80d94..a4621546caa 100644
--- a/docker/lite/Dockerfile.alpine
+++ b/docker/lite/Dockerfile.alpine
@@ -4,8 +4,8 @@ FROM alpine:3.8 AS staging
 
 RUN mkdir -p /vt/vtdataroot/ && mkdir -p /vt/bin && mkdir -p /vt/src/vitess.io/vitess/web/vtctld2
 
-COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld /vt/src/vitess.io/web/
-COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld2/app /vt/src/vitess.io/web/vtctld2/
+COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld /vt/src/vitess.io/web/vtctld
+COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld2/app /vt/src/vitess.io/web/vtctld2/app
 COPY --from=builder /vt/src/vitess.io/vitess/config /vt/config
 COPY --from=builder /vt/bin/mysqlctld /vt/bin/
 COPY --from=builder /vt/bin/vtctld /vt/bin/
diff --git a/docker/test/run.sh b/docker/test/run.sh
index 775f987c8c3..fbc9d8ed89c 100755
--- a/docker/test/run.sh
+++ b/docker/test/run.sh
@@ -204,9 +204,9 @@ fi
 # Clean up host dir mounted VTDATAROOT
 if [[ -n "$hostdir" ]]; then
   # Use Docker user to clean up first, to avoid permission errors.
-  docker run --name=rm_$testid -v $hostdir:/vt/vtdataroot $image bash -c 'rm -rf /vt/vtdataroot/*'
+  #docker run --name=rm_$testid -v $hostdir:/vt/vtdataroot $image bash -c 'rm -rf /vt/vtdataroot/*'
   docker rm -f rm_$testid &>/dev/null
-  rm -rf $hostdir
+  #rm -rf $hostdir
 fi
 
 # If requested, create the cache image.
diff --git a/go/cmd/vtexplain/vtexplain.go b/go/cmd/vtexplain/vtexplain.go
index 41be6d2cc98..b1831c54559 100644
--- a/go/cmd/vtexplain/vtexplain.go
+++ b/go/cmd/vtexplain/vtexplain.go
@@ -122,6 +122,7 @@ func getFileParam(flag, flagFile, name string) (string, error) {
 }
 
 func main() {
+	defer vtexplain.Stop()
 	defer exit.RecoverAll()
 	defer logutil.Flush()
 
@@ -178,7 +179,5 @@ func parseAndRun() error {
 		fmt.Print(vtexplain.ExplainsAsJSON(plans))
 	}
 
-	vtexplain.Stop()
-
 	return nil
 }
diff --git a/go/mysql/server.go b/go/mysql/server.go
index f32977ae46a..0dd9d4e427a 100644
--- a/go/mysql/server.go
+++ b/go/mysql/server.go
@@ -672,13 +672,11 @@ func (l *Listener) parseClientHandshakePacket(c *Conn, firstTime bool, data []by
 
 	// Decode connection attributes send by the client
 	if clientFlags&CapabilityClientConnAttr != 0 {
-		var attrs map[string]string
 		var err error
-		attrs, pos, err = parseConnAttrs(data, pos)
+		_, pos, err = parseConnAttrs(data, pos)
 		if err != nil {
 			return "", "", nil, err
 		}
-		log.Infof("Connection Attributes: %-v", attrs)
 	}
 
 	return username, authMethod, authResponse, nil
diff --git a/go/vt/proto/automation/automation.pb.go b/go/vt/proto/automation/automation.pb.go
index 811fc3ecde8..9cfe471fe11 100644
--- a/go/vt/proto/automation/automation.pb.go
+++ b/go/vt/proto/automation/automation.pb.go
@@ -77,13 +77,13 @@ func (TaskState) EnumDescriptor() ([]byte, []int) {
 }
 
 type ClusterOperation struct {
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// TaskContainer are processed sequentially, one at a time.
-	SerialTasks []*TaskContainer `protobuf:"bytes,2,rep,name=serial_tasks,json=serialTasks" json:"serial_tasks,omitempty"`
+	SerialTasks []*TaskContainer `protobuf:"bytes,2,rep,name=serial_tasks,json=serialTasks,proto3" json:"serial_tasks,omitempty"`
 	// Cached value. This has to be re-evaluated e.g. after a checkpoint load because running tasks may have already finished.
-	State ClusterOperationState `protobuf:"varint,3,opt,name=state,enum=automation.ClusterOperationState" json:"state,omitempty"`
+	State ClusterOperationState `protobuf:"varint,3,opt,name=state,proto3,enum=automation.ClusterOperationState" json:"state,omitempty"`
 	// Error of the first task which failed. Set after state advanced to CLUSTER_OPERATION_DONE. If empty, all tasks succeeded. Cached value, see state above.
-	Error                string   `protobuf:"bytes,4,opt,name=error" json:"error,omitempty"`
+	Error                string   `protobuf:"bytes,4,opt,name=error,proto3" json:"error,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -144,8 +144,8 @@ func (m *ClusterOperation) GetError() string {
 // TaskContainer holds one or more task which may be executed in parallel.
 // "concurrency", if > 0, limits the amount of concurrently executed tasks.
 type TaskContainer struct {
-	ParallelTasks        []*Task  `protobuf:"bytes,1,rep,name=parallel_tasks,json=parallelTasks" json:"parallel_tasks,omitempty"`
-	Concurrency          int32    `protobuf:"varint,2,opt,name=concurrency" json:"concurrency,omitempty"`
+	ParallelTasks        []*Task  `protobuf:"bytes,1,rep,name=parallel_tasks,json=parallelTasks,proto3" json:"parallel_tasks,omitempty"`
+	Concurrency          int32    `protobuf:"varint,2,opt,name=concurrency,proto3" json:"concurrency,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -192,15 +192,15 @@ func (m *TaskContainer) GetConcurrency() int32 {
 // Task represents a specific task which should be automatically executed.
 type Task struct {
 	// Task specification.
-	Name       string            `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	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"`
+	Name       string            `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Parameters map[string]string `protobuf:"bytes,2,rep,name=parameters,proto3" json:"parameters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Runtime data.
-	Id    string    `protobuf:"bytes,3,opt,name=id" json:"id,omitempty"`
-	State TaskState `protobuf:"varint,4,opt,name=state,enum=automation.TaskState" json:"state,omitempty"`
+	Id    string    `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"`
+	State TaskState `protobuf:"varint,4,opt,name=state,proto3,enum=automation.TaskState" json:"state,omitempty"`
 	// Set after state advanced to DONE.
-	Output string `protobuf:"bytes,5,opt,name=output" json:"output,omitempty"`
+	Output string `protobuf:"bytes,5,opt,name=output,proto3" json:"output,omitempty"`
 	// Set after state advanced to DONE. If empty, the task did succeed.
-	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:"-"`
@@ -273,8 +273,8 @@ func (m *Task) GetError() string {
 }
 
 type EnqueueClusterOperationRequest struct {
-	Name                 string            `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	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"`
+	Name                 string            `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Parameters           map[string]string `protobuf:"bytes,2,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:"-"`
@@ -319,7 +319,7 @@ func (m *EnqueueClusterOperationRequest) GetParameters() map[string]string {
 }
 
 type EnqueueClusterOperationResponse struct {
-	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:"-"`
@@ -357,7 +357,7 @@ func (m *EnqueueClusterOperationResponse) GetId() string {
 }
 
 type GetClusterOperationStateRequest struct {
-	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:"-"`
@@ -395,7 +395,7 @@ func (m *GetClusterOperationStateRequest) GetId() string {
 }
 
 type GetClusterOperationStateResponse struct {
-	State                ClusterOperationState `protobuf:"varint,1,opt,name=state,enum=automation.ClusterOperationState" json:"state,omitempty"`
+	State                ClusterOperationState `protobuf:"varint,1,opt,name=state,proto3,enum=automation.ClusterOperationState" json:"state,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -433,7 +433,7 @@ func (m *GetClusterOperationStateResponse) GetState() ClusterOperationState {
 }
 
 type GetClusterOperationDetailsRequest struct {
-	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:"-"`
@@ -472,7 +472,7 @@ func (m *GetClusterOperationDetailsRequest) GetId() string {
 
 type GetClusterOperationDetailsResponse struct {
 	// Full snapshot of the execution e.g. including output of each task.
-	ClusterOp            *ClusterOperation `protobuf:"bytes,2,opt,name=cluster_op,json=clusterOp" json:"cluster_op,omitempty"`
+	ClusterOp            *ClusterOperation `protobuf:"bytes,2,opt,name=cluster_op,json=clusterOp,proto3" json:"cluster_op,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
diff --git a/go/vt/proto/automationservice/automationservice.pb.go b/go/vt/proto/automationservice/automationservice.pb.go
index 5cb974fe48a..e3c00ceddd0 100644
--- a/go/vt/proto/automationservice/automationservice.pb.go
+++ b/go/vt/proto/automationservice/automationservice.pb.go
@@ -32,8 +32,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Automation service
-
+// AutomationClient is the client API for Automation service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type AutomationClient interface {
 	// Start a cluster operation.
 	EnqueueClusterOperation(ctx context.Context, in *automation.EnqueueClusterOperationRequest, opts ...grpc.CallOption) (*automation.EnqueueClusterOperationResponse, error)
@@ -52,7 +53,7 @@ func NewAutomationClient(cc *grpc.ClientConn) AutomationClient {
 
 func (c *automationClient) EnqueueClusterOperation(ctx context.Context, in *automation.EnqueueClusterOperationRequest, opts ...grpc.CallOption) (*automation.EnqueueClusterOperationResponse, error) {
 	out := new(automation.EnqueueClusterOperationResponse)
-	err := grpc.Invoke(ctx, "/automationservice.Automation/EnqueueClusterOperation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/automationservice.Automation/EnqueueClusterOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -61,15 +62,14 @@ func (c *automationClient) EnqueueClusterOperation(ctx context.Context, in *auto
 
 func (c *automationClient) GetClusterOperationDetails(ctx context.Context, in *automation.GetClusterOperationDetailsRequest, opts ...grpc.CallOption) (*automation.GetClusterOperationDetailsResponse, error) {
 	out := new(automation.GetClusterOperationDetailsResponse)
-	err := grpc.Invoke(ctx, "/automationservice.Automation/GetClusterOperationDetails", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/automationservice.Automation/GetClusterOperationDetails", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Automation service
-
+// AutomationServer is the server API for Automation service.
 type AutomationServer interface {
 	// Start a cluster operation.
 	EnqueueClusterOperation(context.Context, *automation.EnqueueClusterOperationRequest) (*automation.EnqueueClusterOperationResponse, error)
diff --git a/go/vt/proto/binlogdata/binlogdata.pb.go b/go/vt/proto/binlogdata/binlogdata.pb.go
index af305cdbe10..c520a6a4f7a 100644
--- a/go/vt/proto/binlogdata/binlogdata.pb.go
+++ b/go/vt/proto/binlogdata/binlogdata.pb.go
@@ -71,11 +71,11 @@ func (BinlogTransaction_Statement_Category) EnumDescriptor() ([]byte, []int) {
 // Charset is the per-statement charset info from a QUERY_EVENT binlog entry.
 type Charset struct {
 	// @@session.character_set_client
-	Client int32 `protobuf:"varint,1,opt,name=client" json:"client,omitempty"`
+	Client int32 `protobuf:"varint,1,opt,name=client,proto3" json:"client,omitempty"`
 	// @@session.collation_connection
-	Conn int32 `protobuf:"varint,2,opt,name=conn" json:"conn,omitempty"`
+	Conn int32 `protobuf:"varint,2,opt,name=conn,proto3" json:"conn,omitempty"`
 	// @@session.collation_server
-	Server               int32    `protobuf:"varint,3,opt,name=server" json:"server,omitempty"`
+	Server               int32    `protobuf:"varint,3,opt,name=server,proto3" json:"server,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -130,9 +130,9 @@ func (m *Charset) GetServer() int32 {
 // It is streamed by vttablet for filtered replication, used during resharding.
 type BinlogTransaction struct {
 	// the statements in this transaction
-	Statements []*BinlogTransaction_Statement `protobuf:"bytes,1,rep,name=statements" json:"statements,omitempty"`
+	Statements []*BinlogTransaction_Statement `protobuf:"bytes,1,rep,name=statements,proto3" json:"statements,omitempty"`
 	// The Event Token for this event.
-	EventToken           *query.EventToken `protobuf:"bytes,4,opt,name=event_token,json=eventToken" json:"event_token,omitempty"`
+	EventToken           *query.EventToken `protobuf:"bytes,4,opt,name=event_token,json=eventToken,proto3" json:"event_token,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -178,9 +178,9 @@ func (m *BinlogTransaction) GetEventToken() *query.EventToken {
 
 type BinlogTransaction_Statement struct {
 	// what type of statement is this?
-	Category BinlogTransaction_Statement_Category `protobuf:"varint,1,opt,name=category,enum=binlogdata.BinlogTransaction_Statement_Category" json:"category,omitempty"`
+	Category BinlogTransaction_Statement_Category `protobuf:"varint,1,opt,name=category,proto3,enum=binlogdata.BinlogTransaction_Statement_Category" json:"category,omitempty"`
 	// charset of this statement, if different from pre-negotiated default.
-	Charset *Charset `protobuf:"bytes,2,opt,name=charset" json:"charset,omitempty"`
+	Charset *Charset `protobuf:"bytes,2,opt,name=charset,proto3" json:"charset,omitempty"`
 	// the sql
 	Sql                  []byte   `protobuf:"bytes,3,opt,name=sql,proto3" json:"sql,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -236,11 +236,11 @@ func (m *BinlogTransaction_Statement) GetSql() []byte {
 // StreamKeyRangeRequest is the payload to StreamKeyRange
 type StreamKeyRangeRequest struct {
 	// where to start
-	Position string `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
+	Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	// what to get
-	KeyRange *topodata.KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange" json:"key_range,omitempty"`
+	KeyRange *topodata.KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	// default charset on the player side
-	Charset              *Charset `protobuf:"bytes,3,opt,name=charset" json:"charset,omitempty"`
+	Charset              *Charset `protobuf:"bytes,3,opt,name=charset,proto3" json:"charset,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -293,7 +293,7 @@ func (m *StreamKeyRangeRequest) GetCharset() *Charset {
 
 // StreamKeyRangeResponse is the response from StreamKeyRange
 type StreamKeyRangeResponse struct {
-	BinlogTransaction    *BinlogTransaction `protobuf:"bytes,1,opt,name=binlog_transaction,json=binlogTransaction" json:"binlog_transaction,omitempty"`
+	BinlogTransaction    *BinlogTransaction `protobuf:"bytes,1,opt,name=binlog_transaction,json=binlogTransaction,proto3" json:"binlog_transaction,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -333,11 +333,11 @@ func (m *StreamKeyRangeResponse) GetBinlogTransaction() *BinlogTransaction {
 // StreamTablesRequest is the payload to StreamTables
 type StreamTablesRequest struct {
 	// where to start
-	Position string `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
+	Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	// what to get
-	Tables []string `protobuf:"bytes,2,rep,name=tables" json:"tables,omitempty"`
+	Tables []string `protobuf:"bytes,2,rep,name=tables,proto3" json:"tables,omitempty"`
 	// default charset on the player side
-	Charset              *Charset `protobuf:"bytes,3,opt,name=charset" json:"charset,omitempty"`
+	Charset              *Charset `protobuf:"bytes,3,opt,name=charset,proto3" json:"charset,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -390,7 +390,7 @@ func (m *StreamTablesRequest) GetCharset() *Charset {
 
 // StreamTablesResponse is the response from StreamTables
 type StreamTablesResponse struct {
-	BinlogTransaction    *BinlogTransaction `protobuf:"bytes,1,opt,name=binlog_transaction,json=binlogTransaction" json:"binlog_transaction,omitempty"`
+	BinlogTransaction    *BinlogTransaction `protobuf:"bytes,1,opt,name=binlog_transaction,json=binlogTransaction,proto3" json:"binlog_transaction,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -432,15 +432,15 @@ func (m *StreamTablesResponse) GetBinlogTransaction() *BinlogTransaction {
 // or a list of tables.
 type BinlogSource struct {
 	// the source keyspace
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// the source shard
-	Shard string `protobuf:"bytes,2,opt,name=shard" json:"shard,omitempty"`
+	Shard string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	// the source tablet type
-	TabletType topodata.TabletType `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// key_range is set if the request is for a keyrange
-	KeyRange *topodata.KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange" json:"key_range,omitempty"`
+	KeyRange *topodata.KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	// tables is set if the request is for a list of tables
-	Tables               []string `protobuf:"bytes,5,rep,name=tables" json:"tables,omitempty"`
+	Tables               []string `protobuf:"bytes,5,rep,name=tables,proto3" json:"tables,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
diff --git a/go/vt/proto/binlogservice/binlogservice.pb.go b/go/vt/proto/binlogservice/binlogservice.pb.go
index e30c88fa272..164dddef669 100644
--- a/go/vt/proto/binlogservice/binlogservice.pb.go
+++ b/go/vt/proto/binlogservice/binlogservice.pb.go
@@ -32,8 +32,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for UpdateStream service
-
+// UpdateStreamClient is the client API for UpdateStream service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type UpdateStreamClient interface {
 	// StreamKeyRange returns the binlog transactions related to
 	// the specified Keyrange.
@@ -52,7 +53,7 @@ func NewUpdateStreamClient(cc *grpc.ClientConn) UpdateStreamClient {
 }
 
 func (c *updateStreamClient) StreamKeyRange(ctx context.Context, in *binlogdata.StreamKeyRangeRequest, opts ...grpc.CallOption) (UpdateStream_StreamKeyRangeClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_UpdateStream_serviceDesc.Streams[0], c.cc, "/binlogservice.UpdateStream/StreamKeyRange", opts...)
+	stream, err := c.cc.NewStream(ctx, &_UpdateStream_serviceDesc.Streams[0], "/binlogservice.UpdateStream/StreamKeyRange", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -84,7 +85,7 @@ func (x *updateStreamStreamKeyRangeClient) Recv() (*binlogdata.StreamKeyRangeRes
 }
 
 func (c *updateStreamClient) StreamTables(ctx context.Context, in *binlogdata.StreamTablesRequest, opts ...grpc.CallOption) (UpdateStream_StreamTablesClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_UpdateStream_serviceDesc.Streams[1], c.cc, "/binlogservice.UpdateStream/StreamTables", opts...)
+	stream, err := c.cc.NewStream(ctx, &_UpdateStream_serviceDesc.Streams[1], "/binlogservice.UpdateStream/StreamTables", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -115,8 +116,7 @@ func (x *updateStreamStreamTablesClient) Recv() (*binlogdata.StreamTablesRespons
 	return m, nil
 }
 
-// Server API for UpdateStream service
-
+// UpdateStreamServer is the server API for UpdateStream service.
 type UpdateStreamServer interface {
 	// StreamKeyRange returns the binlog transactions related to
 	// the specified Keyrange.
diff --git a/go/vt/proto/logutil/logutil.pb.go b/go/vt/proto/logutil/logutil.pb.go
index 61754fc4bab..7b1c092c26b 100644
--- a/go/vt/proto/logutil/logutil.pb.go
+++ b/go/vt/proto/logutil/logutil.pb.go
@@ -55,8 +55,8 @@ func (Level) EnumDescriptor() ([]byte, []int) {
 // Time represents a time stamp in nanoseconds. In go, use logutil library
 // to convert times.
 type Time struct {
-	Seconds              int64    `protobuf:"varint,1,opt,name=seconds" json:"seconds,omitempty"`
-	Nanoseconds          int32    `protobuf:"varint,2,opt,name=nanoseconds" json:"nanoseconds,omitempty"`
+	Seconds              int64    `protobuf:"varint,1,opt,name=seconds,proto3" json:"seconds,omitempty"`
+	Nanoseconds          int32    `protobuf:"varint,2,opt,name=nanoseconds,proto3" json:"nanoseconds,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -102,11 +102,11 @@ func (m *Time) GetNanoseconds() int32 {
 
 // Event is a single logging event
 type Event struct {
-	Time                 *Time    `protobuf:"bytes,1,opt,name=time" json:"time,omitempty"`
-	Level                Level    `protobuf:"varint,2,opt,name=level,enum=logutil.Level" json:"level,omitempty"`
-	File                 string   `protobuf:"bytes,3,opt,name=file" json:"file,omitempty"`
-	Line                 int64    `protobuf:"varint,4,opt,name=line" json:"line,omitempty"`
-	Value                string   `protobuf:"bytes,5,opt,name=value" json:"value,omitempty"`
+	Time                 *Time    `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"`
+	Level                Level    `protobuf:"varint,2,opt,name=level,proto3,enum=logutil.Level" json:"level,omitempty"`
+	File                 string   `protobuf:"bytes,3,opt,name=file,proto3" json:"file,omitempty"`
+	Line                 int64    `protobuf:"varint,4,opt,name=line,proto3" json:"line,omitempty"`
+	Value                string   `protobuf:"bytes,5,opt,name=value,proto3" json:"value,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
diff --git a/go/vt/proto/mysqlctl/mysqlctl.pb.go b/go/vt/proto/mysqlctl/mysqlctl.pb.go
index 32b5da0d8f7..f499dce3cd4 100644
--- a/go/vt/proto/mysqlctl/mysqlctl.pb.go
+++ b/go/vt/proto/mysqlctl/mysqlctl.pb.go
@@ -24,7 +24,7 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type StartRequest struct {
-	MysqldArgs           []string `protobuf:"bytes,1,rep,name=mysqld_args,json=mysqldArgs" json:"mysqld_args,omitempty"`
+	MysqldArgs           []string `protobuf:"bytes,1,rep,name=mysqld_args,json=mysqldArgs,proto3" json:"mysqld_args,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -92,7 +92,7 @@ func (m *StartResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_StartResponse proto.InternalMessageInfo
 
 type ShutdownRequest struct {
-	WaitForMysqld        bool     `protobuf:"varint,1,opt,name=wait_for_mysqld,json=waitForMysqld" json:"wait_for_mysqld,omitempty"`
+	WaitForMysqld        bool     `protobuf:"varint,1,opt,name=wait_for_mysqld,json=waitForMysqld,proto3" json:"wait_for_mysqld,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -360,8 +360,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for MysqlCtl service
-
+// MysqlCtlClient is the client API for MysqlCtl service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type MysqlCtlClient interface {
 	Start(ctx context.Context, in *StartRequest, opts ...grpc.CallOption) (*StartResponse, error)
 	Shutdown(ctx context.Context, in *ShutdownRequest, opts ...grpc.CallOption) (*ShutdownResponse, error)
@@ -380,7 +381,7 @@ func NewMysqlCtlClient(cc *grpc.ClientConn) MysqlCtlClient {
 
 func (c *mysqlCtlClient) Start(ctx context.Context, in *StartRequest, opts ...grpc.CallOption) (*StartResponse, error) {
 	out := new(StartResponse)
-	err := grpc.Invoke(ctx, "/mysqlctl.MysqlCtl/Start", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/mysqlctl.MysqlCtl/Start", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -389,7 +390,7 @@ func (c *mysqlCtlClient) Start(ctx context.Context, in *StartRequest, opts ...gr
 
 func (c *mysqlCtlClient) Shutdown(ctx context.Context, in *ShutdownRequest, opts ...grpc.CallOption) (*ShutdownResponse, error) {
 	out := new(ShutdownResponse)
-	err := grpc.Invoke(ctx, "/mysqlctl.MysqlCtl/Shutdown", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/mysqlctl.MysqlCtl/Shutdown", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -398,7 +399,7 @@ func (c *mysqlCtlClient) Shutdown(ctx context.Context, in *ShutdownRequest, opts
 
 func (c *mysqlCtlClient) RunMysqlUpgrade(ctx context.Context, in *RunMysqlUpgradeRequest, opts ...grpc.CallOption) (*RunMysqlUpgradeResponse, error) {
 	out := new(RunMysqlUpgradeResponse)
-	err := grpc.Invoke(ctx, "/mysqlctl.MysqlCtl/RunMysqlUpgrade", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/mysqlctl.MysqlCtl/RunMysqlUpgrade", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -407,7 +408,7 @@ func (c *mysqlCtlClient) RunMysqlUpgrade(ctx context.Context, in *RunMysqlUpgrad
 
 func (c *mysqlCtlClient) ReinitConfig(ctx context.Context, in *ReinitConfigRequest, opts ...grpc.CallOption) (*ReinitConfigResponse, error) {
 	out := new(ReinitConfigResponse)
-	err := grpc.Invoke(ctx, "/mysqlctl.MysqlCtl/ReinitConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/mysqlctl.MysqlCtl/ReinitConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -416,15 +417,14 @@ func (c *mysqlCtlClient) ReinitConfig(ctx context.Context, in *ReinitConfigReque
 
 func (c *mysqlCtlClient) RefreshConfig(ctx context.Context, in *RefreshConfigRequest, opts ...grpc.CallOption) (*RefreshConfigResponse, error) {
 	out := new(RefreshConfigResponse)
-	err := grpc.Invoke(ctx, "/mysqlctl.MysqlCtl/RefreshConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/mysqlctl.MysqlCtl/RefreshConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for MysqlCtl service
-
+// MysqlCtlServer is the server API for MysqlCtl service.
 type MysqlCtlServer interface {
 	Start(context.Context, *StartRequest) (*StartResponse, error)
 	Shutdown(context.Context, *ShutdownRequest) (*ShutdownResponse, error)
diff --git a/go/vt/proto/query/query.pb.go b/go/vt/proto/query/query.pb.go
index 8df47083a92..483b516fef4 100644
--- a/go/vt/proto/query/query.pb.go
+++ b/go/vt/proto/query/query.pb.go
@@ -488,12 +488,12 @@ func (SplitQueryRequest_Algorithm) EnumDescriptor() ([]byte, []int) {
 // Target describes what the client expects the tablet is.
 // If the tablet does not match, an error is returned.
 type Target struct {
-	Keyspace   string              `protobuf:"bytes,1,opt,name=keyspace" json:"keyspace,omitempty"`
-	Shard      string              `protobuf:"bytes,2,opt,name=shard" json:"shard,omitempty"`
-	TabletType topodata.TabletType `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	Keyspace   string              `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard      string              `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// cell is used for routing queries between vtgate and vttablets. It
 	// is not used when Target is part of the Session sent by the client.
-	Cell                 string   `protobuf:"bytes,4,opt,name=cell" json:"cell,omitempty"`
+	Cell                 string   `protobuf:"bytes,4,opt,name=cell,proto3" json:"cell,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -560,8 +560,8 @@ func (m *Target) GetCell() string {
 // structure, which is not secure at all, because it is provided
 // by the Vitess client.
 type VTGateCallerID struct {
-	Username             string   `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
-	Groups               []string `protobuf:"bytes,2,rep,name=groups" json:"groups,omitempty"`
+	Username             string   `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
+	Groups               []string `protobuf:"bytes,2,rep,name=groups,proto3" json:"groups,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -611,13 +611,13 @@ func (m *VTGateCallerID) GetGroups() []string {
 // is also sent with the replication streams from the binlog service.
 type EventToken struct {
 	// timestamp is the MySQL timestamp of the statements. Seconds since Epoch.
-	Timestamp int64 `protobuf:"varint,1,opt,name=timestamp" json:"timestamp,omitempty"`
+	Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	// The shard name that applied the statements. Note this is not set when
 	// streaming from a vttablet. It is only used on the client -> vtgate link.
-	Shard string `protobuf:"bytes,2,opt,name=shard" json:"shard,omitempty"`
+	Shard string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	// The position on the replication stream after this statement was applied.
 	// It is not the transaction ID / GTID, but the position / GTIDSet.
-	Position             string   `protobuf:"bytes,3,opt,name=position" json:"position,omitempty"`
+	Position             string   `protobuf:"bytes,3,opt,name=position,proto3" json:"position,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -670,7 +670,7 @@ func (m *EventToken) GetPosition() string {
 
 // Value represents a typed value.
 type Value struct {
-	Type                 Type     `protobuf:"varint,1,opt,name=type,enum=query.Type" json:"type,omitempty"`
+	Type                 Type     `protobuf:"varint,1,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
 	Value                []byte   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -717,10 +717,10 @@ func (m *Value) GetValue() []byte {
 
 // BindVariable represents a single bind variable in a Query.
 type BindVariable struct {
-	Type  Type   `protobuf:"varint,1,opt,name=type,enum=query.Type" json:"type,omitempty"`
+	Type  Type   `protobuf:"varint,1,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
 	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	// values are set if type is TUPLE.
-	Values               []*Value `protobuf:"bytes,3,rep,name=values" json:"values,omitempty"`
+	Values               []*Value `protobuf:"bytes,3,rep,name=values,proto3" json:"values,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -774,10 +774,10 @@ func (m *BindVariable) GetValues() []*Value {
 // BoundQuery is a query with its bind variables
 type BoundQuery struct {
 	// sql is the SQL query to execute
-	Sql string `protobuf:"bytes,1,opt,name=sql" json:"sql,omitempty"`
+	Sql string `protobuf:"bytes,1,opt,name=sql,proto3" json:"sql,omitempty"`
 	// bind_variables is a map of all bind variables to expand in the query.
 	// nil values are not allowed. Use NULL_TYPE to express a NULL value.
-	BindVariables        map[string]*BindVariable `protobuf:"bytes,2,rep,name=bind_variables,json=bindVariables" json:"bind_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	BindVariables        map[string]*BindVariable `protobuf:"bytes,2,rep,name=bind_variables,json=bindVariables,proto3" json:"bind_variables,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:"-"`
@@ -824,19 +824,19 @@ func (m *BoundQuery) GetBindVariables() map[string]*BindVariable {
 // ExecuteOptions is passed around for all Execute calls.
 type ExecuteOptions struct {
 	// If set, we will try to include an EventToken with the responses.
-	IncludeEventToken bool `protobuf:"varint,2,opt,name=include_event_token,json=includeEventToken" json:"include_event_token,omitempty"`
+	IncludeEventToken bool `protobuf:"varint,2,opt,name=include_event_token,json=includeEventToken,proto3" json:"include_event_token,omitempty"`
 	// If set, the fresher field may be set as a result comparison to this token.
 	// This is a shortcut so the application doesn't need to care about
 	// comparing EventTokens.
-	CompareEventToken *EventToken `protobuf:"bytes,3,opt,name=compare_event_token,json=compareEventToken" json:"compare_event_token,omitempty"`
+	CompareEventToken *EventToken `protobuf:"bytes,3,opt,name=compare_event_token,json=compareEventToken,proto3" json:"compare_event_token,omitempty"`
 	// Controls what fields are returned in Field message responses from mysql, i.e.
 	// field name, table name, etc. This is an optimization for high-QPS queries where
 	// the client knows what it's getting
-	IncludedFields ExecuteOptions_IncludedFields `protobuf:"varint,4,opt,name=included_fields,json=includedFields,enum=query.ExecuteOptions_IncludedFields" json:"included_fields,omitempty"`
+	IncludedFields ExecuteOptions_IncludedFields `protobuf:"varint,4,opt,name=included_fields,json=includedFields,proto3,enum=query.ExecuteOptions_IncludedFields" json:"included_fields,omitempty"`
 	// client_rows_found specifies if rows_affected should return
 	// rows found instead of rows affected. Behavior is defined
 	// by MySQL's CLIENT_FOUND_ROWS flag.
-	ClientFoundRows bool `protobuf:"varint,5,opt,name=client_found_rows,json=clientFoundRows" json:"client_found_rows,omitempty"`
+	ClientFoundRows bool `protobuf:"varint,5,opt,name=client_found_rows,json=clientFoundRows,proto3" json:"client_found_rows,omitempty"`
 	// workload specifies the type of workload:
 	// OLTP: DMLs allowed, results have row count limit, and
 	// query timeouts are shorter.
@@ -844,14 +844,14 @@ type ExecuteOptions struct {
 	// can be as high as desired.
 	// DBA: no limit on rowcount or timeout, all queries allowed
 	// but intended for long DMLs and DDLs.
-	Workload ExecuteOptions_Workload `protobuf:"varint,6,opt,name=workload,enum=query.ExecuteOptions_Workload" json:"workload,omitempty"`
+	Workload ExecuteOptions_Workload `protobuf:"varint,6,opt,name=workload,proto3,enum=query.ExecuteOptions_Workload" json:"workload,omitempty"`
 	// sql_select_limit sets an implicit limit on all select statements. Since
 	// vitess also sets a rowcount limit on queries, the smallest value wins.
-	SqlSelectLimit       int64                               `protobuf:"varint,8,opt,name=sql_select_limit,json=sqlSelectLimit" json:"sql_select_limit,omitempty"`
-	TransactionIsolation ExecuteOptions_TransactionIsolation `protobuf:"varint,9,opt,name=transaction_isolation,json=transactionIsolation,enum=query.ExecuteOptions_TransactionIsolation" json:"transaction_isolation,omitempty"`
+	SqlSelectLimit       int64                               `protobuf:"varint,8,opt,name=sql_select_limit,json=sqlSelectLimit,proto3" json:"sql_select_limit,omitempty"`
+	TransactionIsolation ExecuteOptions_TransactionIsolation `protobuf:"varint,9,opt,name=transaction_isolation,json=transactionIsolation,proto3,enum=query.ExecuteOptions_TransactionIsolation" json:"transaction_isolation,omitempty"`
 	// skip_query_plan_cache specifies if the query plan shoud be cached by vitess.
 	// By default all query plans are cached.
-	SkipQueryPlanCache   bool     `protobuf:"varint,10,opt,name=skip_query_plan_cache,json=skipQueryPlanCache" json:"skip_query_plan_cache,omitempty"`
+	SkipQueryPlanCache   bool     `protobuf:"varint,10,opt,name=skip_query_plan_cache,json=skipQueryPlanCache,proto3" json:"skip_query_plan_cache,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -940,24 +940,24 @@ func (m *ExecuteOptions) GetSkipQueryPlanCache() bool {
 // Field describes a single column returned by a query
 type Field struct {
 	// name of the field as returned by mysql C API
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// vitess-defined type. Conversion function is in sqltypes package.
-	Type Type `protobuf:"varint,2,opt,name=type,enum=query.Type" json:"type,omitempty"`
+	Type Type `protobuf:"varint,2,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
 	// Remaining fields from mysql C API.
 	// These fields are only populated when ExecuteOptions.included_fields
 	// is set to IncludedFields.ALL.
-	Table    string `protobuf:"bytes,3,opt,name=table" json:"table,omitempty"`
-	OrgTable string `protobuf:"bytes,4,opt,name=org_table,json=orgTable" json:"org_table,omitempty"`
-	Database string `protobuf:"bytes,5,opt,name=database" json:"database,omitempty"`
-	OrgName  string `protobuf:"bytes,6,opt,name=org_name,json=orgName" json:"org_name,omitempty"`
+	Table    string `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"`
+	OrgTable string `protobuf:"bytes,4,opt,name=org_table,json=orgTable,proto3" json:"org_table,omitempty"`
+	Database string `protobuf:"bytes,5,opt,name=database,proto3" json:"database,omitempty"`
+	OrgName  string `protobuf:"bytes,6,opt,name=org_name,json=orgName,proto3" json:"org_name,omitempty"`
 	// column_length is really a uint32. All 32 bits can be used.
-	ColumnLength uint32 `protobuf:"varint,7,opt,name=column_length,json=columnLength" json:"column_length,omitempty"`
+	ColumnLength uint32 `protobuf:"varint,7,opt,name=column_length,json=columnLength,proto3" json:"column_length,omitempty"`
 	// charset is actually a uint16. Only the lower 16 bits are used.
-	Charset uint32 `protobuf:"varint,8,opt,name=charset" json:"charset,omitempty"`
+	Charset uint32 `protobuf:"varint,8,opt,name=charset,proto3" json:"charset,omitempty"`
 	// decimals is actualy a uint8. Only the lower 8 bits are used.
-	Decimals uint32 `protobuf:"varint,9,opt,name=decimals" json:"decimals,omitempty"`
+	Decimals uint32 `protobuf:"varint,9,opt,name=decimals,proto3" json:"decimals,omitempty"`
 	// flags is actually a uint16. Only the lower 16 bits are used.
-	Flags                uint32   `protobuf:"varint,10,opt,name=flags" json:"flags,omitempty"`
+	Flags                uint32   `protobuf:"varint,10,opt,name=flags,proto3" json:"flags,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1063,7 +1063,7 @@ type Row struct {
 	// A length of -1 means that the field is NULL. While
 	// reading values, you have to accummulate the length
 	// to know the offset where the next value begins in values.
-	Lengths []int64 `protobuf:"zigzag64,1,rep,packed,name=lengths" json:"lengths,omitempty"`
+	Lengths []int64 `protobuf:"zigzag64,1,rep,packed,name=lengths,proto3" json:"lengths,omitempty"`
 	// values contains a concatenation of all values in the row.
 	Values               []byte   `protobuf:"bytes,2,opt,name=values,proto3" json:"values,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1114,10 +1114,10 @@ func (m *Row) GetValues() []byte {
 type ResultExtras struct {
 	// event_token is populated if the include_event_token flag is set
 	// in ExecuteOptions.
-	EventToken *EventToken `protobuf:"bytes,1,opt,name=event_token,json=eventToken" json:"event_token,omitempty"`
+	EventToken *EventToken `protobuf:"bytes,1,opt,name=event_token,json=eventToken,proto3" json:"event_token,omitempty"`
 	// If set, it means the data returned with this result is fresher
 	// than the compare_token passed in the ExecuteOptions.
-	Fresher              bool     `protobuf:"varint,2,opt,name=fresher" json:"fresher,omitempty"`
+	Fresher              bool     `protobuf:"varint,2,opt,name=fresher,proto3" json:"fresher,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1171,11 +1171,11 @@ func (m *ResultExtras) GetFresher() bool {
 // len(QueryResult[0].fields) is always equal to len(row) (for each
 // row in rows for each QueryResult in QueryResult[1:]).
 type QueryResult struct {
-	Fields               []*Field      `protobuf:"bytes,1,rep,name=fields" json:"fields,omitempty"`
-	RowsAffected         uint64        `protobuf:"varint,2,opt,name=rows_affected,json=rowsAffected" json:"rows_affected,omitempty"`
-	InsertId             uint64        `protobuf:"varint,3,opt,name=insert_id,json=insertId" json:"insert_id,omitempty"`
-	Rows                 []*Row        `protobuf:"bytes,4,rep,name=rows" json:"rows,omitempty"`
-	Extras               *ResultExtras `protobuf:"bytes,5,opt,name=extras" json:"extras,omitempty"`
+	Fields               []*Field      `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty"`
+	RowsAffected         uint64        `protobuf:"varint,2,opt,name=rows_affected,json=rowsAffected,proto3" json:"rows_affected,omitempty"`
+	InsertId             uint64        `protobuf:"varint,3,opt,name=insert_id,json=insertId,proto3" json:"insert_id,omitempty"`
+	Rows                 []*Row        `protobuf:"bytes,4,rep,name=rows,proto3" json:"rows,omitempty"`
+	Extras               *ResultExtras `protobuf:"bytes,5,opt,name=extras,proto3" json:"extras,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
 	XXX_unrecognized     []byte        `json:"-"`
 	XXX_sizecache        int32         `json:"-"`
@@ -1243,8 +1243,8 @@ func (m *QueryResult) GetExtras() *ResultExtras {
 // QueryWarning is used to convey out of band query execution warnings
 // by storing in the vtgate.Session
 type QueryWarning struct {
-	Code                 uint32   `protobuf:"varint,1,opt,name=code" json:"code,omitempty"`
-	Message              string   `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
+	Code                 uint32   `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:"-"`
@@ -1293,9 +1293,9 @@ func (m *QueryWarning) GetMessage() string {
 // Update Stream calls.
 type StreamEvent struct {
 	// The statements in this transaction.
-	Statements []*StreamEvent_Statement `protobuf:"bytes,1,rep,name=statements" json:"statements,omitempty"`
+	Statements []*StreamEvent_Statement `protobuf:"bytes,1,rep,name=statements,proto3" json:"statements,omitempty"`
 	// The Event Token for this event.
-	EventToken           *EventToken `protobuf:"bytes,2,opt,name=event_token,json=eventToken" json:"event_token,omitempty"`
+	EventToken           *EventToken `protobuf:"bytes,2,opt,name=event_token,json=eventToken,proto3" json:"event_token,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
 	XXX_sizecache        int32       `json:"-"`
@@ -1341,11 +1341,11 @@ func (m *StreamEvent) GetEventToken() *EventToken {
 
 // One individual Statement in a transaction.
 type StreamEvent_Statement struct {
-	Category StreamEvent_Statement_Category `protobuf:"varint,1,opt,name=category,enum=query.StreamEvent_Statement_Category" json:"category,omitempty"`
+	Category StreamEvent_Statement_Category `protobuf:"varint,1,opt,name=category,proto3,enum=query.StreamEvent_Statement_Category" json:"category,omitempty"`
 	// table_name, primary_key_fields and primary_key_values are set for DML.
-	TableName        string   `protobuf:"bytes,2,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
-	PrimaryKeyFields []*Field `protobuf:"bytes,3,rep,name=primary_key_fields,json=primaryKeyFields" json:"primary_key_fields,omitempty"`
-	PrimaryKeyValues []*Row   `protobuf:"bytes,4,rep,name=primary_key_values,json=primaryKeyValues" json:"primary_key_values,omitempty"`
+	TableName        string   `protobuf:"bytes,2,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
+	PrimaryKeyFields []*Field `protobuf:"bytes,3,rep,name=primary_key_fields,json=primaryKeyFields,proto3" json:"primary_key_fields,omitempty"`
+	PrimaryKeyValues []*Row   `protobuf:"bytes,4,rep,name=primary_key_values,json=primaryKeyValues,proto3" json:"primary_key_values,omitempty"`
 	// sql is set for all queries.
 	// FIXME(alainjobart) we may not need it for DMLs.
 	Sql                  []byte   `protobuf:"bytes,5,opt,name=sql,proto3" json:"sql,omitempty"`
@@ -1415,12 +1415,12 @@ func (m *StreamEvent_Statement) GetSql() []byte {
 
 // ExecuteRequest is the payload to Execute
 type ExecuteRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	Query                *BoundQuery     `protobuf:"bytes,4,opt,name=query" json:"query,omitempty"`
-	TransactionId        int64           `protobuf:"varint,5,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
-	Options              *ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query                *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	TransactionId        int64           `protobuf:"varint,5,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Options              *ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -1494,7 +1494,7 @@ func (m *ExecuteRequest) GetOptions() *ExecuteOptions {
 
 // ExecuteResponse is the returned value from Execute
 type ExecuteResponse struct {
-	Result               *QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -1536,9 +1536,9 @@ func (m *ExecuteResponse) GetResult() *QueryResult {
 // TODO: To be used in ExecuteBatchResponse and BeginExecuteBatchResponse.
 type ResultWithError struct {
 	// error contains an query level error, only set if result is unset.
-	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// result contains the query result, only set if error is unset.
-	Result               *QueryResult `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"`
+	Result               *QueryResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -1584,13 +1584,13 @@ func (m *ResultWithError) GetResult() *QueryResult {
 
 // ExecuteBatchRequest is the payload to ExecuteBatch
 type ExecuteBatchRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	Queries              []*BoundQuery   `protobuf:"bytes,4,rep,name=queries" json:"queries,omitempty"`
-	AsTransaction        bool            `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction" json:"as_transaction,omitempty"`
-	TransactionId        int64           `protobuf:"varint,6,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
-	Options              *ExecuteOptions `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Queries              []*BoundQuery   `protobuf:"bytes,4,rep,name=queries,proto3" json:"queries,omitempty"`
+	AsTransaction        bool            `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction,proto3" json:"as_transaction,omitempty"`
+	TransactionId        int64           `protobuf:"varint,6,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Options              *ExecuteOptions `protobuf:"bytes,7,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -1671,7 +1671,7 @@ func (m *ExecuteBatchRequest) GetOptions() *ExecuteOptions {
 
 // ExecuteBatchResponse is the returned value from ExecuteBatch
 type ExecuteBatchResponse struct {
-	Results              []*QueryResult `protobuf:"bytes,1,rep,name=results" json:"results,omitempty"`
+	Results              []*QueryResult `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
@@ -1710,11 +1710,11 @@ func (m *ExecuteBatchResponse) GetResults() []*QueryResult {
 
 // StreamExecuteRequest is the payload to StreamExecute
 type StreamExecuteRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	Query                *BoundQuery     `protobuf:"bytes,4,opt,name=query" json:"query,omitempty"`
-	Options              *ExecuteOptions `protobuf:"bytes,5,opt,name=options" json:"options,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query                *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	Options              *ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -1781,7 +1781,7 @@ func (m *StreamExecuteRequest) GetOptions() *ExecuteOptions {
 
 // StreamExecuteResponse is the returned value from StreamExecute
 type StreamExecuteResponse struct {
-	Result               *QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -1820,10 +1820,10 @@ func (m *StreamExecuteResponse) GetResult() *QueryResult {
 
 // BeginRequest is the payload to Begin
 type BeginRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	Options              *ExecuteOptions `protobuf:"bytes,4,opt,name=options" json:"options,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Options              *ExecuteOptions `protobuf:"bytes,4,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -1883,7 +1883,7 @@ func (m *BeginRequest) GetOptions() *ExecuteOptions {
 
 // BeginResponse is the returned value from Begin
 type BeginResponse struct {
-	TransactionId        int64    `protobuf:"varint,1,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
+	TransactionId        int64    `protobuf:"varint,1,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1922,10 +1922,10 @@ func (m *BeginResponse) GetTransactionId() int64 {
 
 // CommitRequest is the payload to Commit
 type CommitRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2016,10 +2016,10 @@ var xxx_messageInfo_CommitResponse proto.InternalMessageInfo
 
 // RollbackRequest is the payload to Rollback
 type RollbackRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2110,11 +2110,11 @@ var xxx_messageInfo_RollbackResponse proto.InternalMessageInfo
 
 // PrepareRequest is the payload to Prepare
 type PrepareRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
-	Dtid                 string          `protobuf:"bytes,5,opt,name=dtid" json:"dtid,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Dtid                 string          `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2212,10 +2212,10 @@ var xxx_messageInfo_PrepareResponse proto.InternalMessageInfo
 
 // CommitPreparedRequest is the payload to CommitPrepared
 type CommitPreparedRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	Dtid                 string          `protobuf:"bytes,4,opt,name=dtid" json:"dtid,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Dtid                 string          `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2306,11 +2306,11 @@ var xxx_messageInfo_CommitPreparedResponse proto.InternalMessageInfo
 
 // RollbackPreparedRequest is the payload to RollbackPrepared
 type RollbackPreparedRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
-	Dtid                 string          `protobuf:"bytes,5,opt,name=dtid" json:"dtid,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Dtid                 string          `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2408,11 +2408,11 @@ var xxx_messageInfo_RollbackPreparedResponse proto.InternalMessageInfo
 
 // CreateTransactionRequest is the payload to CreateTransaction
 type CreateTransactionRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	Dtid                 string          `protobuf:"bytes,4,opt,name=dtid" json:"dtid,omitempty"`
-	Participants         []*Target       `protobuf:"bytes,5,rep,name=participants" json:"participants,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Dtid                 string          `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	Participants         []*Target       `protobuf:"bytes,5,rep,name=participants,proto3" json:"participants,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2510,11 +2510,11 @@ var xxx_messageInfo_CreateTransactionResponse proto.InternalMessageInfo
 
 // StartCommitRequest is the payload to StartCommit
 type StartCommitRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
-	Dtid                 string          `protobuf:"bytes,5,opt,name=dtid" json:"dtid,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Dtid                 string          `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2612,11 +2612,11 @@ var xxx_messageInfo_StartCommitResponse proto.InternalMessageInfo
 
 // SetRollbackRequest is the payload to SetRollback
 type SetRollbackRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
-	Dtid                 string          `protobuf:"bytes,5,opt,name=dtid" json:"dtid,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId        int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Dtid                 string          `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2714,10 +2714,10 @@ var xxx_messageInfo_SetRollbackResponse proto.InternalMessageInfo
 
 // ConcludeTransactionRequest is the payload to ConcludeTransaction
 type ConcludeTransactionRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	Dtid                 string          `protobuf:"bytes,4,opt,name=dtid" json:"dtid,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Dtid                 string          `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2808,10 +2808,10 @@ var xxx_messageInfo_ConcludeTransactionResponse proto.InternalMessageInfo
 
 // ReadTransactionRequest is the payload to ReadTransaction
 type ReadTransactionRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	Dtid                 string          `protobuf:"bytes,4,opt,name=dtid" json:"dtid,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Dtid                 string          `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2871,7 +2871,7 @@ func (m *ReadTransactionRequest) GetDtid() string {
 
 // ReadTransactionResponse is the returned value from ReadTransaction
 type ReadTransactionResponse struct {
-	Metadata             *TransactionMetadata `protobuf:"bytes,1,opt,name=metadata" json:"metadata,omitempty"`
+	Metadata             *TransactionMetadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
 	XXX_unrecognized     []byte               `json:"-"`
 	XXX_sizecache        int32                `json:"-"`
@@ -2910,11 +2910,11 @@ func (m *ReadTransactionResponse) GetMetadata() *TransactionMetadata {
 
 // BeginExecuteRequest is the payload to BeginExecute
 type BeginExecuteRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	Query                *BoundQuery     `protobuf:"bytes,4,opt,name=query" json:"query,omitempty"`
-	Options              *ExecuteOptions `protobuf:"bytes,5,opt,name=options" json:"options,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query                *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	Options              *ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2984,10 +2984,10 @@ type BeginExecuteResponse struct {
 	// error contains an application level error if necessary. Note the
 	// transaction_id may be set, even when an error is returned, if the begin
 	// worked but the execute failed.
-	Error  *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
-	Result *QueryResult    `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"`
+	Error  *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	Result *QueryResult    `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
 	// transaction_id might be non-zero even if an error is present.
-	TransactionId        int64    `protobuf:"varint,3,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
+	TransactionId        int64    `protobuf:"varint,3,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -3040,12 +3040,12 @@ func (m *BeginExecuteResponse) GetTransactionId() int64 {
 
 // BeginExecuteBatchRequest is the payload to BeginExecuteBatch
 type BeginExecuteBatchRequest struct {
-	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target               *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	Queries              []*BoundQuery   `protobuf:"bytes,4,rep,name=queries" json:"queries,omitempty"`
-	AsTransaction        bool            `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction" json:"as_transaction,omitempty"`
-	Options              *ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"`
+	EffectiveCallerId    *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId    *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target               *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Queries              []*BoundQuery   `protobuf:"bytes,4,rep,name=queries,proto3" json:"queries,omitempty"`
+	AsTransaction        bool            `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction,proto3" json:"as_transaction,omitempty"`
+	Options              *ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -3122,10 +3122,10 @@ type BeginExecuteBatchResponse struct {
 	// error contains an application level error if necessary. Note the
 	// transaction_id may be set, even when an error is returned, if the begin
 	// worked but the execute failed.
-	Error   *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
-	Results []*QueryResult  `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"`
+	Error   *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	Results []*QueryResult  `protobuf:"bytes,2,rep,name=results,proto3" json:"results,omitempty"`
 	// transaction_id might be non-zero even if an error is present.
-	TransactionId        int64    `protobuf:"varint,3,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
+	TransactionId        int64    `protobuf:"varint,3,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -3178,11 +3178,11 @@ func (m *BeginExecuteBatchResponse) GetTransactionId() int64 {
 
 // MessageStreamRequest is the request payload for MessageStream.
 type MessageStreamRequest struct {
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
+	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// name is the message table name.
-	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:"-"`
@@ -3242,7 +3242,7 @@ func (m *MessageStreamRequest) GetName() string {
 
 // MessageStreamResponse is a response for MessageStream.
 type MessageStreamResponse struct {
-	Result               *QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -3281,12 +3281,12 @@ func (m *MessageStreamResponse) GetResult() *QueryResult {
 
 // MessageAckRequest is the request payload for MessageAck.
 type MessageAckRequest struct {
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
+	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// name is the message table name.
-	Name                 string   `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
-	Ids                  []*Value `protobuf:"bytes,5,rep,name=ids" json:"ids,omitempty"`
+	Name                 string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	Ids                  []*Value `protobuf:"bytes,5,rep,name=ids,proto3" json:"ids,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -3356,7 +3356,7 @@ type MessageAckResponse struct {
 	// result contains the result of the ack operation.
 	// Since this acts like a DML, only
 	// RowsAffected is returned in the result.
-	Result               *QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -3396,15 +3396,15 @@ func (m *MessageAckResponse) GetResult() *QueryResult {
 // SplitQueryRequest is the payload for SplitQuery sent by VTGate to a VTTablet.
 // See vtgate.SplitQueryRequest for more details.
 type SplitQueryRequest struct {
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
-	Query             *BoundQuery     `protobuf:"bytes,4,opt,name=query" json:"query,omitempty"`
-	SplitColumn       []string        `protobuf:"bytes,5,rep,name=split_column,json=splitColumn" json:"split_column,omitempty"`
+	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query             *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	SplitColumn       []string        `protobuf:"bytes,5,rep,name=split_column,json=splitColumn,proto3" json:"split_column,omitempty"`
 	// Exactly one of the following must be nonzero.
-	SplitCount           int64                       `protobuf:"varint,6,opt,name=split_count,json=splitCount" json:"split_count,omitempty"`
-	NumRowsPerQueryPart  int64                       `protobuf:"varint,8,opt,name=num_rows_per_query_part,json=numRowsPerQueryPart" json:"num_rows_per_query_part,omitempty"`
-	Algorithm            SplitQueryRequest_Algorithm `protobuf:"varint,9,opt,name=algorithm,enum=query.SplitQueryRequest_Algorithm" json:"algorithm,omitempty"`
+	SplitCount           int64                       `protobuf:"varint,6,opt,name=split_count,json=splitCount,proto3" json:"split_count,omitempty"`
+	NumRowsPerQueryPart  int64                       `protobuf:"varint,8,opt,name=num_rows_per_query_part,json=numRowsPerQueryPart,proto3" json:"num_rows_per_query_part,omitempty"`
+	Algorithm            SplitQueryRequest_Algorithm `protobuf:"varint,9,opt,name=algorithm,proto3,enum=query.SplitQueryRequest_Algorithm" json:"algorithm,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
 	XXX_unrecognized     []byte                      `json:"-"`
 	XXX_sizecache        int32                       `json:"-"`
@@ -3493,9 +3493,9 @@ func (m *SplitQueryRequest) GetAlgorithm() SplitQueryRequest_Algorithm {
 // QuerySplit represents one query to execute on the tablet
 type QuerySplit struct {
 	// query is the query to execute
-	Query *BoundQuery `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"`
+	Query *BoundQuery `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
 	// row_count is the approximate row count the query will return
-	RowCount             int64    `protobuf:"varint,2,opt,name=row_count,json=rowCount" json:"row_count,omitempty"`
+	RowCount             int64    `protobuf:"varint,2,opt,name=row_count,json=rowCount,proto3" json:"row_count,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -3542,7 +3542,7 @@ func (m *QuerySplit) GetRowCount() int64 {
 // SplitQueryResponse is returned by SplitQuery and represents all the queries
 // to execute in order to get the entire data set.
 type SplitQueryResponse struct {
-	Queries              []*QuerySplit `protobuf:"bytes,1,rep,name=queries" json:"queries,omitempty"`
+	Queries              []*QuerySplit `protobuf:"bytes,1,rep,name=queries,proto3" json:"queries,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
 	XXX_unrecognized     []byte        `json:"-"`
 	XXX_sizecache        int32         `json:"-"`
@@ -3616,30 +3616,30 @@ type RealtimeStats struct {
 	// health_error is the last error we got from health check,
 	// or empty is the server is healthy. This is used for subset selection,
 	// we do not send queries to servers that are not healthy.
-	HealthError string `protobuf:"bytes,1,opt,name=health_error,json=healthError" json:"health_error,omitempty"`
+	HealthError string `protobuf:"bytes,1,opt,name=health_error,json=healthError,proto3" json:"health_error,omitempty"`
 	// seconds_behind_master is populated for slaves only. It indicates
 	// how far behind on (MySQL) replication a slave currently is.  It is used
 	// by clients for subset selection (so we don't try to send traffic
 	// to tablets that are too far behind).
 	// NOTE: This field must not be evaluated if "health_error" is not empty.
 	// TODO(mberlin): Let's switch it to int64 instead?
-	SecondsBehindMaster uint32 `protobuf:"varint,2,opt,name=seconds_behind_master,json=secondsBehindMaster" json:"seconds_behind_master,omitempty"`
+	SecondsBehindMaster uint32 `protobuf:"varint,2,opt,name=seconds_behind_master,json=secondsBehindMaster,proto3" json:"seconds_behind_master,omitempty"`
 	// bin_log_players_count is the number of currently running binlog players.
 	// if the value is 0, it means that filtered replication is currently not
 	// running on the tablet. If >0, filtered replication is running.
 	// NOTE: This field must not be evaluated if "health_error" is not empty.
-	BinlogPlayersCount int32 `protobuf:"varint,3,opt,name=binlog_players_count,json=binlogPlayersCount" json:"binlog_players_count,omitempty"`
+	BinlogPlayersCount int32 `protobuf:"varint,3,opt,name=binlog_players_count,json=binlogPlayersCount,proto3" json:"binlog_players_count,omitempty"`
 	// seconds_behind_master_filtered_replication is populated for the receiving
 	// master of an ongoing filtered replication only.
 	// It specifies how far the receiving master lags behind the sending master.
 	// NOTE: This field must not be evaluated if "health_error" is not empty.
 	// NOTE: This field must not be evaluated if "bin_log_players_count" is 0.
-	SecondsBehindMasterFilteredReplication int64 `protobuf:"varint,4,opt,name=seconds_behind_master_filtered_replication,json=secondsBehindMasterFilteredReplication" json:"seconds_behind_master_filtered_replication,omitempty"`
+	SecondsBehindMasterFilteredReplication int64 `protobuf:"varint,4,opt,name=seconds_behind_master_filtered_replication,json=secondsBehindMasterFilteredReplication,proto3" json:"seconds_behind_master_filtered_replication,omitempty"`
 	// cpu_usage is used for load-based balancing
-	CpuUsage float64 `protobuf:"fixed64,5,opt,name=cpu_usage,json=cpuUsage" json:"cpu_usage,omitempty"`
+	CpuUsage float64 `protobuf:"fixed64,5,opt,name=cpu_usage,json=cpuUsage,proto3" json:"cpu_usage,omitempty"`
 	// qps is the average QPS (queries per second) rate in the last XX seconds
 	// where XX is usually 60 (See query_service_stats.go).
-	Qps                  float64  `protobuf:"fixed64,6,opt,name=qps" json:"qps,omitempty"`
+	Qps                  float64  `protobuf:"fixed64,6,opt,name=qps,proto3" json:"qps,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -3717,17 +3717,17 @@ func (m *RealtimeStats) GetQps() float64 {
 // layer.
 type AggregateStats struct {
 	// healthy_tablet_count is the number of healthy tablets in the group.
-	HealthyTabletCount int32 `protobuf:"varint,1,opt,name=healthy_tablet_count,json=healthyTabletCount" json:"healthy_tablet_count,omitempty"`
+	HealthyTabletCount int32 `protobuf:"varint,1,opt,name=healthy_tablet_count,json=healthyTabletCount,proto3" json:"healthy_tablet_count,omitempty"`
 	// unhealthy_tablet_count is the number of unhealthy tablets in the group.
-	UnhealthyTabletCount int32 `protobuf:"varint,2,opt,name=unhealthy_tablet_count,json=unhealthyTabletCount" json:"unhealthy_tablet_count,omitempty"`
+	UnhealthyTabletCount int32 `protobuf:"varint,2,opt,name=unhealthy_tablet_count,json=unhealthyTabletCount,proto3" json:"unhealthy_tablet_count,omitempty"`
 	// seconds_behind_master_min is the minimum of the
 	// seconds_behind_master values of the healthy tablets. It is unset
 	// if the tablet type is master.
-	SecondsBehindMasterMin uint32 `protobuf:"varint,3,opt,name=seconds_behind_master_min,json=secondsBehindMasterMin" json:"seconds_behind_master_min,omitempty"`
+	SecondsBehindMasterMin uint32 `protobuf:"varint,3,opt,name=seconds_behind_master_min,json=secondsBehindMasterMin,proto3" json:"seconds_behind_master_min,omitempty"`
 	// seconds_behind_master_max is the maximum of the
 	// seconds_behind_master values of the healthy tablets. It is unset
 	// if the tablet type is master.
-	SecondsBehindMasterMax uint32   `protobuf:"varint,4,opt,name=seconds_behind_master_max,json=secondsBehindMasterMax" json:"seconds_behind_master_max,omitempty"`
+	SecondsBehindMasterMax uint32   `protobuf:"varint,4,opt,name=seconds_behind_master_max,json=secondsBehindMasterMax,proto3" json:"seconds_behind_master_max,omitempty"`
 	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
 	XXX_unrecognized       []byte   `json:"-"`
 	XXX_sizecache          int32    `json:"-"`
@@ -3797,11 +3797,11 @@ func (m *AggregateStats) GetSecondsBehindMasterMax() uint32 {
 type StreamHealthResponse struct {
 	// target is the current server type. Only queries with that exact Target
 	// record will be accepted (the cell may not match, however).
-	Target *Target `protobuf:"bytes,1,opt,name=target" json:"target,omitempty"`
+	Target *Target `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
 	// serving is true iff the tablet is serving. A tablet may not be serving
 	// if filtered replication is enabled on a master for instance,
 	// or if a replica should not be used because the keyspace is being resharded.
-	Serving bool `protobuf:"varint,2,opt,name=serving" json:"serving,omitempty"`
+	Serving bool `protobuf:"varint,2,opt,name=serving,proto3" json:"serving,omitempty"`
 	// tablet_externally_reparented_timestamp can be interpreted as the
 	// last time we knew that this tablet was the MASTER of this shard
 	// (if StreamHealthResponse describes a group of tablets, between
@@ -3828,18 +3828,18 @@ type StreamHealthResponse struct {
 	//    topology (see go/vt/vttablet/tabletmanager/init_tablet.go)
 	// OR
 	// d) 0 if the vttablet was never a MASTER.
-	TabletExternallyReparentedTimestamp int64 `protobuf:"varint,3,opt,name=tablet_externally_reparented_timestamp,json=tabletExternallyReparentedTimestamp" json:"tablet_externally_reparented_timestamp,omitempty"`
+	TabletExternallyReparentedTimestamp int64 `protobuf:"varint,3,opt,name=tablet_externally_reparented_timestamp,json=tabletExternallyReparentedTimestamp,proto3" json:"tablet_externally_reparented_timestamp,omitempty"`
 	// realtime_stats contains information about the tablet status.
 	// It is only filled in if the information is about a tablet.
-	RealtimeStats *RealtimeStats `protobuf:"bytes,4,opt,name=realtime_stats,json=realtimeStats" json:"realtime_stats,omitempty"`
+	RealtimeStats *RealtimeStats `protobuf:"bytes,4,opt,name=realtime_stats,json=realtimeStats,proto3" json:"realtime_stats,omitempty"`
 	// AggregateStats constains information about the group of tablet status.
 	// It is only filled in if the information is about a group of tablets.
-	AggregateStats *AggregateStats `protobuf:"bytes,6,opt,name=aggregate_stats,json=aggregateStats" json:"aggregate_stats,omitempty"`
+	AggregateStats *AggregateStats `protobuf:"bytes,6,opt,name=aggregate_stats,json=aggregateStats,proto3" json:"aggregate_stats,omitempty"`
 	// tablet_alias is the alias of the sending tablet. The discovery/healthcheck.go
 	// code uses it to verify that it's talking to the correct tablet and that it
 	// hasn't changed in the meantime e.g. due to tablet restarts where ports or
 	// ips have been reused but assigned differently.
-	TabletAlias          *topodata.TabletAlias `protobuf:"bytes,5,opt,name=tablet_alias,json=tabletAlias" json:"tablet_alias,omitempty"`
+	TabletAlias          *topodata.TabletAlias `protobuf:"bytes,5,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -3915,15 +3915,15 @@ func (m *StreamHealthResponse) GetTabletAlias() *topodata.TabletAlias {
 // position and timestamp can be set. If neither is set, we will start
 // streaming from the current binlog position.
 type UpdateStreamRequest struct {
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"`
+	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// If position is set, we will start the streaming from that replication
 	// position. Incompatible with timestamp.
-	Position string `protobuf:"bytes,4,opt,name=position" json:"position,omitempty"`
+	Position string `protobuf:"bytes,4,opt,name=position,proto3" json:"position,omitempty"`
 	// If timestamp is set, we will start the streaming from the first
 	// event in the binlogs that have that timestamp. Incompatible with position.
-	Timestamp            int64    `protobuf:"varint,5,opt,name=timestamp" json:"timestamp,omitempty"`
+	Timestamp            int64    `protobuf:"varint,5,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -3990,7 +3990,7 @@ func (m *UpdateStreamRequest) GetTimestamp() int64 {
 
 // UpdateStreamResponse is returned by UpdateStream
 type UpdateStreamResponse struct {
-	Event                *StreamEvent `protobuf:"bytes,1,opt,name=event" json:"event,omitempty"`
+	Event                *StreamEvent `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -4029,10 +4029,10 @@ func (m *UpdateStreamResponse) GetEvent() *StreamEvent {
 
 // TransactionMetadata contains the metadata for a distributed transaction.
 type TransactionMetadata struct {
-	Dtid                 string           `protobuf:"bytes,1,opt,name=dtid" json:"dtid,omitempty"`
-	State                TransactionState `protobuf:"varint,2,opt,name=state,enum=query.TransactionState" json:"state,omitempty"`
-	TimeCreated          int64            `protobuf:"varint,3,opt,name=time_created,json=timeCreated" json:"time_created,omitempty"`
-	Participants         []*Target        `protobuf:"bytes,4,rep,name=participants" json:"participants,omitempty"`
+	Dtid                 string           `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	State                TransactionState `protobuf:"varint,2,opt,name=state,proto3,enum=query.TransactionState" json:"state,omitempty"`
+	TimeCreated          int64            `protobuf:"varint,3,opt,name=time_created,json=timeCreated,proto3" json:"time_created,omitempty"`
+	Participants         []*Target        `protobuf:"bytes,4,rep,name=participants,proto3" json:"participants,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
 	XXX_unrecognized     []byte           `json:"-"`
 	XXX_sizecache        int32            `json:"-"`
diff --git a/go/vt/proto/queryservice/queryservice.pb.go b/go/vt/proto/queryservice/queryservice.pb.go
index 77c23018388..c6c7ad3be1e 100644
--- a/go/vt/proto/queryservice/queryservice.pb.go
+++ b/go/vt/proto/queryservice/queryservice.pb.go
@@ -32,8 +32,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Query service
-
+// QueryClient is the client API for Query service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type QueryClient interface {
 	// Execute executes the specified SQL query (might be in a
 	// transaction context, if Query.transaction_id is set).
@@ -96,7 +97,7 @@ func NewQueryClient(cc *grpc.ClientConn) QueryClient {
 
 func (c *queryClient) Execute(ctx context.Context, in *query.ExecuteRequest, opts ...grpc.CallOption) (*query.ExecuteResponse, error) {
 	out := new(query.ExecuteResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/Execute", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/Execute", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -105,7 +106,7 @@ func (c *queryClient) Execute(ctx context.Context, in *query.ExecuteRequest, opt
 
 func (c *queryClient) ExecuteBatch(ctx context.Context, in *query.ExecuteBatchRequest, opts ...grpc.CallOption) (*query.ExecuteBatchResponse, error) {
 	out := new(query.ExecuteBatchResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/ExecuteBatch", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/ExecuteBatch", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -113,7 +114,7 @@ func (c *queryClient) ExecuteBatch(ctx context.Context, in *query.ExecuteBatchRe
 }
 
 func (c *queryClient) StreamExecute(ctx context.Context, in *query.StreamExecuteRequest, opts ...grpc.CallOption) (Query_StreamExecuteClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Query_serviceDesc.Streams[0], c.cc, "/queryservice.Query/StreamExecute", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Query_serviceDesc.Streams[0], "/queryservice.Query/StreamExecute", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -146,7 +147,7 @@ func (x *queryStreamExecuteClient) Recv() (*query.StreamExecuteResponse, error)
 
 func (c *queryClient) Begin(ctx context.Context, in *query.BeginRequest, opts ...grpc.CallOption) (*query.BeginResponse, error) {
 	out := new(query.BeginResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/Begin", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/Begin", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -155,7 +156,7 @@ func (c *queryClient) Begin(ctx context.Context, in *query.BeginRequest, opts ..
 
 func (c *queryClient) Commit(ctx context.Context, in *query.CommitRequest, opts ...grpc.CallOption) (*query.CommitResponse, error) {
 	out := new(query.CommitResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/Commit", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/Commit", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -164,7 +165,7 @@ func (c *queryClient) Commit(ctx context.Context, in *query.CommitRequest, opts
 
 func (c *queryClient) Rollback(ctx context.Context, in *query.RollbackRequest, opts ...grpc.CallOption) (*query.RollbackResponse, error) {
 	out := new(query.RollbackResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/Rollback", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/Rollback", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -173,7 +174,7 @@ func (c *queryClient) Rollback(ctx context.Context, in *query.RollbackRequest, o
 
 func (c *queryClient) Prepare(ctx context.Context, in *query.PrepareRequest, opts ...grpc.CallOption) (*query.PrepareResponse, error) {
 	out := new(query.PrepareResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/Prepare", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/Prepare", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -182,7 +183,7 @@ func (c *queryClient) Prepare(ctx context.Context, in *query.PrepareRequest, opt
 
 func (c *queryClient) CommitPrepared(ctx context.Context, in *query.CommitPreparedRequest, opts ...grpc.CallOption) (*query.CommitPreparedResponse, error) {
 	out := new(query.CommitPreparedResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/CommitPrepared", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/CommitPrepared", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -191,7 +192,7 @@ func (c *queryClient) CommitPrepared(ctx context.Context, in *query.CommitPrepar
 
 func (c *queryClient) RollbackPrepared(ctx context.Context, in *query.RollbackPreparedRequest, opts ...grpc.CallOption) (*query.RollbackPreparedResponse, error) {
 	out := new(query.RollbackPreparedResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/RollbackPrepared", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/RollbackPrepared", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -200,7 +201,7 @@ func (c *queryClient) RollbackPrepared(ctx context.Context, in *query.RollbackPr
 
 func (c *queryClient) CreateTransaction(ctx context.Context, in *query.CreateTransactionRequest, opts ...grpc.CallOption) (*query.CreateTransactionResponse, error) {
 	out := new(query.CreateTransactionResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/CreateTransaction", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/CreateTransaction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -209,7 +210,7 @@ func (c *queryClient) CreateTransaction(ctx context.Context, in *query.CreateTra
 
 func (c *queryClient) StartCommit(ctx context.Context, in *query.StartCommitRequest, opts ...grpc.CallOption) (*query.StartCommitResponse, error) {
 	out := new(query.StartCommitResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/StartCommit", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/StartCommit", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -218,7 +219,7 @@ func (c *queryClient) StartCommit(ctx context.Context, in *query.StartCommitRequ
 
 func (c *queryClient) SetRollback(ctx context.Context, in *query.SetRollbackRequest, opts ...grpc.CallOption) (*query.SetRollbackResponse, error) {
 	out := new(query.SetRollbackResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/SetRollback", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/SetRollback", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -227,7 +228,7 @@ func (c *queryClient) SetRollback(ctx context.Context, in *query.SetRollbackRequ
 
 func (c *queryClient) ConcludeTransaction(ctx context.Context, in *query.ConcludeTransactionRequest, opts ...grpc.CallOption) (*query.ConcludeTransactionResponse, error) {
 	out := new(query.ConcludeTransactionResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/ConcludeTransaction", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/ConcludeTransaction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -236,7 +237,7 @@ func (c *queryClient) ConcludeTransaction(ctx context.Context, in *query.Conclud
 
 func (c *queryClient) ReadTransaction(ctx context.Context, in *query.ReadTransactionRequest, opts ...grpc.CallOption) (*query.ReadTransactionResponse, error) {
 	out := new(query.ReadTransactionResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/ReadTransaction", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/ReadTransaction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -245,7 +246,7 @@ func (c *queryClient) ReadTransaction(ctx context.Context, in *query.ReadTransac
 
 func (c *queryClient) BeginExecute(ctx context.Context, in *query.BeginExecuteRequest, opts ...grpc.CallOption) (*query.BeginExecuteResponse, error) {
 	out := new(query.BeginExecuteResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/BeginExecute", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/BeginExecute", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -254,7 +255,7 @@ func (c *queryClient) BeginExecute(ctx context.Context, in *query.BeginExecuteRe
 
 func (c *queryClient) BeginExecuteBatch(ctx context.Context, in *query.BeginExecuteBatchRequest, opts ...grpc.CallOption) (*query.BeginExecuteBatchResponse, error) {
 	out := new(query.BeginExecuteBatchResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/BeginExecuteBatch", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/BeginExecuteBatch", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -262,7 +263,7 @@ func (c *queryClient) BeginExecuteBatch(ctx context.Context, in *query.BeginExec
 }
 
 func (c *queryClient) MessageStream(ctx context.Context, in *query.MessageStreamRequest, opts ...grpc.CallOption) (Query_MessageStreamClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Query_serviceDesc.Streams[1], c.cc, "/queryservice.Query/MessageStream", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Query_serviceDesc.Streams[1], "/queryservice.Query/MessageStream", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -295,7 +296,7 @@ func (x *queryMessageStreamClient) Recv() (*query.MessageStreamResponse, error)
 
 func (c *queryClient) MessageAck(ctx context.Context, in *query.MessageAckRequest, opts ...grpc.CallOption) (*query.MessageAckResponse, error) {
 	out := new(query.MessageAckResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/MessageAck", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/MessageAck", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -304,7 +305,7 @@ func (c *queryClient) MessageAck(ctx context.Context, in *query.MessageAckReques
 
 func (c *queryClient) SplitQuery(ctx context.Context, in *query.SplitQueryRequest, opts ...grpc.CallOption) (*query.SplitQueryResponse, error) {
 	out := new(query.SplitQueryResponse)
-	err := grpc.Invoke(ctx, "/queryservice.Query/SplitQuery", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/queryservice.Query/SplitQuery", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -312,7 +313,7 @@ func (c *queryClient) SplitQuery(ctx context.Context, in *query.SplitQueryReques
 }
 
 func (c *queryClient) StreamHealth(ctx context.Context, in *query.StreamHealthRequest, opts ...grpc.CallOption) (Query_StreamHealthClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Query_serviceDesc.Streams[2], c.cc, "/queryservice.Query/StreamHealth", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Query_serviceDesc.Streams[2], "/queryservice.Query/StreamHealth", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -344,7 +345,7 @@ func (x *queryStreamHealthClient) Recv() (*query.StreamHealthResponse, error) {
 }
 
 func (c *queryClient) UpdateStream(ctx context.Context, in *query.UpdateStreamRequest, opts ...grpc.CallOption) (Query_UpdateStreamClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Query_serviceDesc.Streams[3], c.cc, "/queryservice.Query/UpdateStream", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Query_serviceDesc.Streams[3], "/queryservice.Query/UpdateStream", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -375,8 +376,7 @@ func (x *queryUpdateStreamClient) Recv() (*query.UpdateStreamResponse, error) {
 	return m, nil
 }
 
-// Server API for Query service
-
+// QueryServer is the server API for Query service.
 type QueryServer interface {
 	// Execute executes the specified SQL query (might be in a
 	// transaction context, if Query.transaction_id is set).
diff --git a/go/vt/proto/replicationdata/replicationdata.pb.go b/go/vt/proto/replicationdata/replicationdata.pb.go
index 1242842898e..e308aa9230c 100644
--- a/go/vt/proto/replicationdata/replicationdata.pb.go
+++ b/go/vt/proto/replicationdata/replicationdata.pb.go
@@ -21,13 +21,13 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // Status is the replication status for MySQL (returned by 'show slave status'
 // and parsed into a Position and fields).
 type Status struct {
-	Position             string   `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
-	SlaveIoRunning       bool     `protobuf:"varint,2,opt,name=slave_io_running,json=slaveIoRunning" json:"slave_io_running,omitempty"`
-	SlaveSqlRunning      bool     `protobuf:"varint,3,opt,name=slave_sql_running,json=slaveSqlRunning" json:"slave_sql_running,omitempty"`
-	SecondsBehindMaster  uint32   `protobuf:"varint,4,opt,name=seconds_behind_master,json=secondsBehindMaster" json:"seconds_behind_master,omitempty"`
-	MasterHost           string   `protobuf:"bytes,5,opt,name=master_host,json=masterHost" json:"master_host,omitempty"`
-	MasterPort           int32    `protobuf:"varint,6,opt,name=master_port,json=masterPort" json:"master_port,omitempty"`
-	MasterConnectRetry   int32    `protobuf:"varint,7,opt,name=master_connect_retry,json=masterConnectRetry" json:"master_connect_retry,omitempty"`
+	Position             string   `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
+	SlaveIoRunning       bool     `protobuf:"varint,2,opt,name=slave_io_running,json=slaveIoRunning,proto3" json:"slave_io_running,omitempty"`
+	SlaveSqlRunning      bool     `protobuf:"varint,3,opt,name=slave_sql_running,json=slaveSqlRunning,proto3" json:"slave_sql_running,omitempty"`
+	SecondsBehindMaster  uint32   `protobuf:"varint,4,opt,name=seconds_behind_master,json=secondsBehindMaster,proto3" json:"seconds_behind_master,omitempty"`
+	MasterHost           string   `protobuf:"bytes,5,opt,name=master_host,json=masterHost,proto3" json:"master_host,omitempty"`
+	MasterPort           int32    `protobuf:"varint,6,opt,name=master_port,json=masterPort,proto3" json:"master_port,omitempty"`
+	MasterConnectRetry   int32    `protobuf:"varint,7,opt,name=master_connect_retry,json=masterConnectRetry,proto3" json:"master_connect_retry,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
diff --git a/go/vt/proto/tableacl/tableacl.pb.go b/go/vt/proto/tableacl/tableacl.pb.go
index 11c91525dcf..0b807555005 100644
--- a/go/vt/proto/tableacl/tableacl.pb.go
+++ b/go/vt/proto/tableacl/tableacl.pb.go
@@ -20,12 +20,12 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 // TableGroupSpec defines ACLs for a group of tables.
 type TableGroupSpec struct {
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// either tables or a table name prefixes (if it ends in a %)
-	TableNamesOrPrefixes []string `protobuf:"bytes,2,rep,name=table_names_or_prefixes,json=tableNamesOrPrefixes" json:"table_names_or_prefixes,omitempty"`
-	Readers              []string `protobuf:"bytes,3,rep,name=readers" json:"readers,omitempty"`
-	Writers              []string `protobuf:"bytes,4,rep,name=writers" json:"writers,omitempty"`
-	Admins               []string `protobuf:"bytes,5,rep,name=admins" json:"admins,omitempty"`
+	TableNamesOrPrefixes []string `protobuf:"bytes,2,rep,name=table_names_or_prefixes,json=tableNamesOrPrefixes,proto3" json:"table_names_or_prefixes,omitempty"`
+	Readers              []string `protobuf:"bytes,3,rep,name=readers,proto3" json:"readers,omitempty"`
+	Writers              []string `protobuf:"bytes,4,rep,name=writers,proto3" json:"writers,omitempty"`
+	Admins               []string `protobuf:"bytes,5,rep,name=admins,proto3" json:"admins,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -91,7 +91,7 @@ func (m *TableGroupSpec) GetAdmins() []string {
 }
 
 type Config struct {
-	TableGroups          []*TableGroupSpec `protobuf:"bytes,1,rep,name=table_groups,json=tableGroups" json:"table_groups,omitempty"`
+	TableGroups          []*TableGroupSpec `protobuf:"bytes,1,rep,name=table_groups,json=tableGroups,proto3" json:"table_groups,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
index 34d7c6c7479..d780c3bd0e3 100644
--- a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
+++ b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
@@ -24,19 +24,19 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type TableDefinition struct {
 	// the table 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 SQL to run to create the table
-	Schema string `protobuf:"bytes,2,opt,name=schema" json:"schema,omitempty"`
+	Schema string `protobuf:"bytes,2,opt,name=schema,proto3" json:"schema,omitempty"`
 	// the columns in the order that will be used to dump and load the data
-	Columns []string `protobuf:"bytes,3,rep,name=columns" json:"columns,omitempty"`
+	Columns []string `protobuf:"bytes,3,rep,name=columns,proto3" json:"columns,omitempty"`
 	// the primary key columns in the primary key order
-	PrimaryKeyColumns []string `protobuf:"bytes,4,rep,name=primary_key_columns,json=primaryKeyColumns" json:"primary_key_columns,omitempty"`
+	PrimaryKeyColumns []string `protobuf:"bytes,4,rep,name=primary_key_columns,json=primaryKeyColumns,proto3" json:"primary_key_columns,omitempty"`
 	// type is either mysqlctl.TableBaseTable or mysqlctl.TableView
-	Type string `protobuf:"bytes,5,opt,name=type" json:"type,omitempty"`
+	Type string `protobuf:"bytes,5,opt,name=type,proto3" json:"type,omitempty"`
 	// how much space the data file takes.
-	DataLength uint64 `protobuf:"varint,6,opt,name=data_length,json=dataLength" json:"data_length,omitempty"`
+	DataLength uint64 `protobuf:"varint,6,opt,name=data_length,json=dataLength,proto3" json:"data_length,omitempty"`
 	// approximate number of rows
-	RowCount             uint64   `protobuf:"varint,7,opt,name=row_count,json=rowCount" json:"row_count,omitempty"`
+	RowCount             uint64   `protobuf:"varint,7,opt,name=row_count,json=rowCount,proto3" json:"row_count,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -116,9 +116,9 @@ func (m *TableDefinition) GetRowCount() uint64 {
 }
 
 type SchemaDefinition struct {
-	DatabaseSchema       string             `protobuf:"bytes,1,opt,name=database_schema,json=databaseSchema" json:"database_schema,omitempty"`
-	TableDefinitions     []*TableDefinition `protobuf:"bytes,2,rep,name=table_definitions,json=tableDefinitions" json:"table_definitions,omitempty"`
-	Version              string             `protobuf:"bytes,3,opt,name=version" json:"version,omitempty"`
+	DatabaseSchema       string             `protobuf:"bytes,1,opt,name=database_schema,json=databaseSchema,proto3" json:"database_schema,omitempty"`
+	TableDefinitions     []*TableDefinition `protobuf:"bytes,2,rep,name=table_definitions,json=tableDefinitions,proto3" json:"table_definitions,omitempty"`
+	Version              string             `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -171,9 +171,9 @@ func (m *SchemaDefinition) GetVersion() string {
 
 type SchemaChangeResult struct {
 	// before_schema holds the schema before each change.
-	BeforeSchema *SchemaDefinition `protobuf:"bytes,1,opt,name=before_schema,json=beforeSchema" json:"before_schema,omitempty"`
+	BeforeSchema *SchemaDefinition `protobuf:"bytes,1,opt,name=before_schema,json=beforeSchema,proto3" json:"before_schema,omitempty"`
 	// after_schema holds the schema after each change.
-	AfterSchema          *SchemaDefinition `protobuf:"bytes,2,opt,name=after_schema,json=afterSchema" json:"after_schema,omitempty"`
+	AfterSchema          *SchemaDefinition `protobuf:"bytes,2,opt,name=after_schema,json=afterSchema,proto3" json:"after_schema,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -221,10 +221,10 @@ func (m *SchemaChangeResult) GetAfterSchema() *SchemaDefinition {
 // Primary key is Host+User
 // PasswordChecksum is the crc64 of the password, for security reasons
 type UserPermission struct {
-	Host                 string            `protobuf:"bytes,1,opt,name=host" json:"host,omitempty"`
-	User                 string            `protobuf:"bytes,2,opt,name=user" json:"user,omitempty"`
-	PasswordChecksum     uint64            `protobuf:"varint,3,opt,name=password_checksum,json=passwordChecksum" json:"password_checksum,omitempty"`
-	Privileges           map[string]string `protobuf:"bytes,4,rep,name=privileges" json:"privileges,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Host                 string            `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
+	User                 string            `protobuf:"bytes,2,opt,name=user,proto3" json:"user,omitempty"`
+	PasswordChecksum     uint64            `protobuf:"varint,3,opt,name=password_checksum,json=passwordChecksum,proto3" json:"password_checksum,omitempty"`
+	Privileges           map[string]string `protobuf:"bytes,4,rep,name=privileges,proto3" json:"privileges,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:"-"`
@@ -285,10 +285,10 @@ func (m *UserPermission) GetPrivileges() map[string]string {
 // DbPermission describes a single row in the mysql.db table
 // Primary key is Host+Db+User
 type DbPermission struct {
-	Host                 string            `protobuf:"bytes,1,opt,name=host" json:"host,omitempty"`
-	Db                   string            `protobuf:"bytes,2,opt,name=db" json:"db,omitempty"`
-	User                 string            `protobuf:"bytes,3,opt,name=user" json:"user,omitempty"`
-	Privileges           map[string]string `protobuf:"bytes,4,rep,name=privileges" json:"privileges,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Host                 string            `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
+	Db                   string            `protobuf:"bytes,2,opt,name=db,proto3" json:"db,omitempty"`
+	User                 string            `protobuf:"bytes,3,opt,name=user,proto3" json:"user,omitempty"`
+	Privileges           map[string]string `protobuf:"bytes,4,rep,name=privileges,proto3" json:"privileges,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:"-"`
@@ -349,8 +349,8 @@ func (m *DbPermission) GetPrivileges() map[string]string {
 // Permissions have all the rows in mysql.{user,db} tables,
 // (all rows are sorted by primary key)
 type Permissions struct {
-	UserPermissions      []*UserPermission `protobuf:"bytes,1,rep,name=user_permissions,json=userPermissions" json:"user_permissions,omitempty"`
-	DbPermissions        []*DbPermission   `protobuf:"bytes,2,rep,name=db_permissions,json=dbPermissions" json:"db_permissions,omitempty"`
+	UserPermissions      []*UserPermission `protobuf:"bytes,1,rep,name=user_permissions,json=userPermissions,proto3" json:"user_permissions,omitempty"`
+	DbPermissions        []*DbPermission   `protobuf:"bytes,2,rep,name=db_permissions,json=dbPermissions,proto3" json:"db_permissions,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -395,7 +395,7 @@ func (m *Permissions) GetDbPermissions() []*DbPermission {
 }
 
 type PingRequest struct {
-	Payload              string   `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
+	Payload              string   `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -433,7 +433,7 @@ func (m *PingRequest) GetPayload() string {
 }
 
 type PingResponse struct {
-	Payload              string   `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
+	Payload              string   `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -472,7 +472,7 @@ func (m *PingResponse) GetPayload() string {
 
 type SleepRequest struct {
 	// duration is in nanoseconds
-	Duration             int64    `protobuf:"varint,1,opt,name=duration" json:"duration,omitempty"`
+	Duration             int64    `protobuf:"varint,1,opt,name=duration,proto3" json:"duration,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -540,9 +540,9 @@ func (m *SleepResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_SleepResponse proto.InternalMessageInfo
 
 type ExecuteHookRequest struct {
-	Name                 string            `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Parameters           []string          `protobuf:"bytes,2,rep,name=parameters" json:"parameters,omitempty"`
-	ExtraEnv             map[string]string `protobuf:"bytes,3,rep,name=extra_env,json=extraEnv" json:"extra_env,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Name                 string            `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Parameters           []string          `protobuf:"bytes,2,rep,name=parameters,proto3" json:"parameters,omitempty"`
+	ExtraEnv             map[string]string `protobuf:"bytes,3,rep,name=extra_env,json=extraEnv,proto3" json:"extra_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:"-"`
@@ -594,9 +594,9 @@ func (m *ExecuteHookRequest) GetExtraEnv() map[string]string {
 }
 
 type ExecuteHookResponse struct {
-	ExitStatus           int64    `protobuf:"varint,1,opt,name=exit_status,json=exitStatus" json:"exit_status,omitempty"`
-	Stdout               string   `protobuf:"bytes,2,opt,name=stdout" json:"stdout,omitempty"`
-	Stderr               string   `protobuf:"bytes,3,opt,name=stderr" json:"stderr,omitempty"`
+	ExitStatus           int64    `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
+	Stdout               string   `protobuf:"bytes,2,opt,name=stdout,proto3" json:"stdout,omitempty"`
+	Stderr               string   `protobuf:"bytes,3,opt,name=stderr,proto3" json:"stderr,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -648,9 +648,9 @@ func (m *ExecuteHookResponse) GetStderr() string {
 }
 
 type GetSchemaRequest struct {
-	Tables               []string `protobuf:"bytes,1,rep,name=tables" json:"tables,omitempty"`
-	IncludeViews         bool     `protobuf:"varint,2,opt,name=include_views,json=includeViews" json:"include_views,omitempty"`
-	ExcludeTables        []string `protobuf:"bytes,3,rep,name=exclude_tables,json=excludeTables" json:"exclude_tables,omitempty"`
+	Tables               []string `protobuf:"bytes,1,rep,name=tables,proto3" json:"tables,omitempty"`
+	IncludeViews         bool     `protobuf:"varint,2,opt,name=include_views,json=includeViews,proto3" json:"include_views,omitempty"`
+	ExcludeTables        []string `protobuf:"bytes,3,rep,name=exclude_tables,json=excludeTables,proto3" json:"exclude_tables,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -702,7 +702,7 @@ func (m *GetSchemaRequest) GetExcludeTables() []string {
 }
 
 type GetSchemaResponse struct {
-	SchemaDefinition     *SchemaDefinition `protobuf:"bytes,1,opt,name=schema_definition,json=schemaDefinition" json:"schema_definition,omitempty"`
+	SchemaDefinition     *SchemaDefinition `protobuf:"bytes,1,opt,name=schema_definition,json=schemaDefinition,proto3" json:"schema_definition,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -770,7 +770,7 @@ func (m *GetPermissionsRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_GetPermissionsRequest proto.InternalMessageInfo
 
 type GetPermissionsResponse struct {
-	Permissions          *Permissions `protobuf:"bytes,1,opt,name=permissions" json:"permissions,omitempty"`
+	Permissions          *Permissions `protobuf:"bytes,1,opt,name=permissions,proto3" json:"permissions,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -928,7 +928,7 @@ func (m *SetReadWriteResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_SetReadWriteResponse proto.InternalMessageInfo
 
 type ChangeTypeRequest struct {
-	TabletType           topodata.TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType           topodata.TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
 	XXX_unrecognized     []byte              `json:"-"`
 	XXX_sizecache        int32               `json:"-"`
@@ -1116,7 +1116,7 @@ func (m *RunHealthCheckResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_RunHealthCheckResponse proto.InternalMessageInfo
 
 type IgnoreHealthErrorRequest struct {
-	Pattern              string   `protobuf:"bytes,1,opt,name=pattern" json:"pattern,omitempty"`
+	Pattern              string   `protobuf:"bytes,1,opt,name=pattern,proto3" json:"pattern,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1187,7 +1187,7 @@ type ReloadSchemaRequest struct {
 	// wait_position allows scheduling a schema reload to occur after a
 	// given DDL has replicated to this slave, by specifying a replication
 	// position to wait for. Leave empty to trigger the reload immediately.
-	WaitPosition         string   `protobuf:"bytes,1,opt,name=wait_position,json=waitPosition" json:"wait_position,omitempty"`
+	WaitPosition         string   `protobuf:"bytes,1,opt,name=wait_position,json=waitPosition,proto3" json:"wait_position,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1255,7 +1255,7 @@ func (m *ReloadSchemaResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_ReloadSchemaResponse proto.InternalMessageInfo
 
 type PreflightSchemaRequest struct {
-	Changes              []string `protobuf:"bytes,1,rep,name=changes" json:"changes,omitempty"`
+	Changes              []string `protobuf:"bytes,1,rep,name=changes,proto3" json:"changes,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1295,7 +1295,7 @@ func (m *PreflightSchemaRequest) GetChanges() []string {
 type PreflightSchemaResponse struct {
 	// change_results has for each change the schema before and after it.
 	// The number of elements is identical to the length of "changes" in the request.
-	ChangeResults        []*SchemaChangeResult `protobuf:"bytes,1,rep,name=change_results,json=changeResults" json:"change_results,omitempty"`
+	ChangeResults        []*SchemaChangeResult `protobuf:"bytes,1,rep,name=change_results,json=changeResults,proto3" json:"change_results,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -1333,11 +1333,11 @@ func (m *PreflightSchemaResponse) GetChangeResults() []*SchemaChangeResult {
 }
 
 type ApplySchemaRequest struct {
-	Sql                  string            `protobuf:"bytes,1,opt,name=sql" json:"sql,omitempty"`
-	Force                bool              `protobuf:"varint,2,opt,name=force" json:"force,omitempty"`
-	AllowReplication     bool              `protobuf:"varint,3,opt,name=allow_replication,json=allowReplication" json:"allow_replication,omitempty"`
-	BeforeSchema         *SchemaDefinition `protobuf:"bytes,4,opt,name=before_schema,json=beforeSchema" json:"before_schema,omitempty"`
-	AfterSchema          *SchemaDefinition `protobuf:"bytes,5,opt,name=after_schema,json=afterSchema" json:"after_schema,omitempty"`
+	Sql                  string            `protobuf:"bytes,1,opt,name=sql,proto3" json:"sql,omitempty"`
+	Force                bool              `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"`
+	AllowReplication     bool              `protobuf:"varint,3,opt,name=allow_replication,json=allowReplication,proto3" json:"allow_replication,omitempty"`
+	BeforeSchema         *SchemaDefinition `protobuf:"bytes,4,opt,name=before_schema,json=beforeSchema,proto3" json:"before_schema,omitempty"`
+	AfterSchema          *SchemaDefinition `protobuf:"bytes,5,opt,name=after_schema,json=afterSchema,proto3" json:"after_schema,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -1403,8 +1403,8 @@ func (m *ApplySchemaRequest) GetAfterSchema() *SchemaDefinition {
 }
 
 type ApplySchemaResponse struct {
-	BeforeSchema         *SchemaDefinition `protobuf:"bytes,1,opt,name=before_schema,json=beforeSchema" json:"before_schema,omitempty"`
-	AfterSchema          *SchemaDefinition `protobuf:"bytes,2,opt,name=after_schema,json=afterSchema" json:"after_schema,omitempty"`
+	BeforeSchema         *SchemaDefinition `protobuf:"bytes,1,opt,name=before_schema,json=beforeSchema,proto3" json:"before_schema,omitempty"`
+	AfterSchema          *SchemaDefinition `protobuf:"bytes,2,opt,name=after_schema,json=afterSchema,proto3" json:"after_schema,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -1450,10 +1450,10 @@ func (m *ApplySchemaResponse) GetAfterSchema() *SchemaDefinition {
 
 type ExecuteFetchAsDbaRequest struct {
 	Query                []byte   `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
-	DbName               string   `protobuf:"bytes,2,opt,name=db_name,json=dbName" json:"db_name,omitempty"`
-	MaxRows              uint64   `protobuf:"varint,3,opt,name=max_rows,json=maxRows" json:"max_rows,omitempty"`
-	DisableBinlogs       bool     `protobuf:"varint,4,opt,name=disable_binlogs,json=disableBinlogs" json:"disable_binlogs,omitempty"`
-	ReloadSchema         bool     `protobuf:"varint,5,opt,name=reload_schema,json=reloadSchema" json:"reload_schema,omitempty"`
+	DbName               string   `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"`
+	MaxRows              uint64   `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
+	DisableBinlogs       bool     `protobuf:"varint,4,opt,name=disable_binlogs,json=disableBinlogs,proto3" json:"disable_binlogs,omitempty"`
+	ReloadSchema         bool     `protobuf:"varint,5,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1519,7 +1519,7 @@ func (m *ExecuteFetchAsDbaRequest) GetReloadSchema() bool {
 }
 
 type ExecuteFetchAsDbaResponse struct {
-	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -1558,9 +1558,9 @@ func (m *ExecuteFetchAsDbaResponse) GetResult() *query.QueryResult {
 
 type ExecuteFetchAsAllPrivsRequest struct {
 	Query                []byte   `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
-	DbName               string   `protobuf:"bytes,2,opt,name=db_name,json=dbName" json:"db_name,omitempty"`
-	MaxRows              uint64   `protobuf:"varint,3,opt,name=max_rows,json=maxRows" json:"max_rows,omitempty"`
-	ReloadSchema         bool     `protobuf:"varint,4,opt,name=reload_schema,json=reloadSchema" json:"reload_schema,omitempty"`
+	DbName               string   `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"`
+	MaxRows              uint64   `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
+	ReloadSchema         bool     `protobuf:"varint,4,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1619,7 +1619,7 @@ func (m *ExecuteFetchAsAllPrivsRequest) GetReloadSchema() bool {
 }
 
 type ExecuteFetchAsAllPrivsResponse struct {
-	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -1658,7 +1658,7 @@ func (m *ExecuteFetchAsAllPrivsResponse) GetResult() *query.QueryResult {
 
 type ExecuteFetchAsAppRequest struct {
 	Query                []byte   `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
-	MaxRows              uint64   `protobuf:"varint,2,opt,name=max_rows,json=maxRows" json:"max_rows,omitempty"`
+	MaxRows              uint64   `protobuf:"varint,2,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1703,7 +1703,7 @@ func (m *ExecuteFetchAsAppRequest) GetMaxRows() uint64 {
 }
 
 type ExecuteFetchAsAppResponse struct {
-	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -1771,7 +1771,7 @@ func (m *SlaveStatusRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_SlaveStatusRequest proto.InternalMessageInfo
 
 type SlaveStatusResponse struct {
-	Status               *replicationdata.Status `protobuf:"bytes,1,opt,name=status" json:"status,omitempty"`
+	Status               *replicationdata.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
 	XXX_unrecognized     []byte                  `json:"-"`
 	XXX_sizecache        int32                   `json:"-"`
@@ -1839,7 +1839,7 @@ func (m *MasterPositionRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_MasterPositionRequest proto.InternalMessageInfo
 
 type MasterPositionResponse struct {
-	Position             string   `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
+	Position             string   `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1937,8 +1937,8 @@ func (m *StopSlaveResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_StopSlaveResponse proto.InternalMessageInfo
 
 type StopSlaveMinimumRequest struct {
-	Position             string   `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
-	WaitTimeout          int64    `protobuf:"varint,2,opt,name=wait_timeout,json=waitTimeout" json:"wait_timeout,omitempty"`
+	Position             string   `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
+	WaitTimeout          int64    `protobuf:"varint,2,opt,name=wait_timeout,json=waitTimeout,proto3" json:"wait_timeout,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1983,7 +1983,7 @@ func (m *StopSlaveMinimumRequest) GetWaitTimeout() int64 {
 }
 
 type StopSlaveMinimumResponse struct {
-	Position             string   `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
+	Position             string   `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2084,7 +2084,7 @@ type TabletExternallyReparentedRequest struct {
 	// external_id is an string value that may be provided by an external
 	// agent for tracking purposes. The tablet will emit this string in
 	// events triggered by TabletExternallyReparented, such as VitessReparent.
-	ExternalId           string   `protobuf:"bytes,1,opt,name=external_id,json=externalId" json:"external_id,omitempty"`
+	ExternalId           string   `protobuf:"bytes,1,opt,name=external_id,json=externalId,proto3" json:"external_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2242,7 +2242,7 @@ func (m *GetSlavesRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_GetSlavesRequest proto.InternalMessageInfo
 
 type GetSlavesResponse struct {
-	Addrs                []string `protobuf:"bytes,1,rep,name=addrs" json:"addrs,omitempty"`
+	Addrs                []string `protobuf:"bytes,1,rep,name=addrs,proto3" json:"addrs,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2340,7 +2340,7 @@ func (m *ResetReplicationResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_ResetReplicationResponse proto.InternalMessageInfo
 
 type VReplicationExecRequest 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:"-"`
@@ -2378,7 +2378,7 @@ func (m *VReplicationExecRequest) GetQuery() string {
 }
 
 type VReplicationExecResponse struct {
-	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -2416,8 +2416,8 @@ func (m *VReplicationExecResponse) GetResult() *query.QueryResult {
 }
 
 type VReplicationWaitForPosRequest struct {
-	Id                   int64    `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
-	Position             string   `protobuf:"bytes,2,opt,name=position" json:"position,omitempty"`
+	Id                   int64    `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Position             string   `protobuf:"bytes,2,opt,name=position,proto3" json:"position,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2522,7 +2522,7 @@ func (m *InitMasterRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_InitMasterRequest proto.InternalMessageInfo
 
 type InitMasterResponse struct {
-	Position             string   `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
+	Position             string   `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2560,10 +2560,10 @@ func (m *InitMasterResponse) GetPosition() string {
 }
 
 type PopulateReparentJournalRequest struct {
-	TimeCreatedNs        int64                 `protobuf:"varint,1,opt,name=time_created_ns,json=timeCreatedNs" json:"time_created_ns,omitempty"`
-	ActionName           string                `protobuf:"bytes,2,opt,name=action_name,json=actionName" json:"action_name,omitempty"`
-	MasterAlias          *topodata.TabletAlias `protobuf:"bytes,3,opt,name=master_alias,json=masterAlias" json:"master_alias,omitempty"`
-	ReplicationPosition  string                `protobuf:"bytes,4,opt,name=replication_position,json=replicationPosition" json:"replication_position,omitempty"`
+	TimeCreatedNs        int64                 `protobuf:"varint,1,opt,name=time_created_ns,json=timeCreatedNs,proto3" json:"time_created_ns,omitempty"`
+	ActionName           string                `protobuf:"bytes,2,opt,name=action_name,json=actionName,proto3" json:"action_name,omitempty"`
+	MasterAlias          *topodata.TabletAlias `protobuf:"bytes,3,opt,name=master_alias,json=masterAlias,proto3" json:"master_alias,omitempty"`
+	ReplicationPosition  string                `protobuf:"bytes,4,opt,name=replication_position,json=replicationPosition,proto3" json:"replication_position,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -2652,9 +2652,9 @@ func (m *PopulateReparentJournalResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_PopulateReparentJournalResponse proto.InternalMessageInfo
 
 type InitSlaveRequest struct {
-	Parent               *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	ReplicationPosition  string                `protobuf:"bytes,2,opt,name=replication_position,json=replicationPosition" json:"replication_position,omitempty"`
-	TimeCreatedNs        int64                 `protobuf:"varint,3,opt,name=time_created_ns,json=timeCreatedNs" json:"time_created_ns,omitempty"`
+	Parent               *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	ReplicationPosition  string                `protobuf:"bytes,2,opt,name=replication_position,json=replicationPosition,proto3" json:"replication_position,omitempty"`
+	TimeCreatedNs        int64                 `protobuf:"varint,3,opt,name=time_created_ns,json=timeCreatedNs,proto3" json:"time_created_ns,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -2766,7 +2766,7 @@ func (m *DemoteMasterRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_DemoteMasterRequest proto.InternalMessageInfo
 
 type DemoteMasterResponse struct {
-	Position             string   `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
+	Position             string   `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2804,7 +2804,7 @@ func (m *DemoteMasterResponse) GetPosition() string {
 }
 
 type PromoteSlaveWhenCaughtUpRequest struct {
-	Position             string   `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
+	Position             string   `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2842,7 +2842,7 @@ func (m *PromoteSlaveWhenCaughtUpRequest) GetPosition() string {
 }
 
 type PromoteSlaveWhenCaughtUpResponse struct {
-	Position             string   `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
+	Position             string   `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2940,9 +2940,9 @@ func (m *SlaveWasPromotedResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_SlaveWasPromotedResponse proto.InternalMessageInfo
 
 type SetMasterRequest struct {
-	Parent               *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	TimeCreatedNs        int64                 `protobuf:"varint,2,opt,name=time_created_ns,json=timeCreatedNs" json:"time_created_ns,omitempty"`
-	ForceStartSlave      bool                  `protobuf:"varint,3,opt,name=force_start_slave,json=forceStartSlave" json:"force_start_slave,omitempty"`
+	Parent               *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	TimeCreatedNs        int64                 `protobuf:"varint,2,opt,name=time_created_ns,json=timeCreatedNs,proto3" json:"time_created_ns,omitempty"`
+	ForceStartSlave      bool                  `protobuf:"varint,3,opt,name=force_start_slave,json=forceStartSlave,proto3" json:"force_start_slave,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -3025,7 +3025,7 @@ var xxx_messageInfo_SetMasterResponse proto.InternalMessageInfo
 
 type SlaveWasRestartedRequest struct {
 	// the parent alias the tablet should have
-	Parent               *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent               *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -3123,7 +3123,7 @@ func (m *StopReplicationAndGetStatusRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_StopReplicationAndGetStatusRequest proto.InternalMessageInfo
 
 type StopReplicationAndGetStatusResponse struct {
-	Status               *replicationdata.Status `protobuf:"bytes,1,opt,name=status" json:"status,omitempty"`
+	Status               *replicationdata.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
 	XXX_unrecognized     []byte                  `json:"-"`
 	XXX_sizecache        int32                   `json:"-"`
@@ -3191,7 +3191,7 @@ func (m *PromoteSlaveRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_PromoteSlaveRequest proto.InternalMessageInfo
 
 type PromoteSlaveResponse struct {
-	Position             string   `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
+	Position             string   `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -3229,7 +3229,7 @@ func (m *PromoteSlaveResponse) GetPosition() string {
 }
 
 type BackupRequest struct {
-	Concurrency          int64    `protobuf:"varint,1,opt,name=concurrency" json:"concurrency,omitempty"`
+	Concurrency          int64    `protobuf:"varint,1,opt,name=concurrency,proto3" json:"concurrency,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -3267,7 +3267,7 @@ func (m *BackupRequest) GetConcurrency() int64 {
 }
 
 type BackupResponse struct {
-	Event                *logutil.Event `protobuf:"bytes,1,opt,name=event" json:"event,omitempty"`
+	Event                *logutil.Event `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
@@ -3335,7 +3335,7 @@ func (m *RestoreFromBackupRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_RestoreFromBackupRequest proto.InternalMessageInfo
 
 type RestoreFromBackupResponse struct {
-	Event                *logutil.Event `protobuf:"bytes,1,opt,name=event" json:"event,omitempty"`
+	Event                *logutil.Event `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
diff --git a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go
index ab1ac62d4e7..11555ab3a4f 100644
--- a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go
+++ b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go
@@ -32,8 +32,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for TabletManager service
-
+// TabletManagerClient is the client API for TabletManager service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type TabletManagerClient interface {
 	// Ping returns the input payload
 	Ping(ctx context.Context, in *tabletmanagerdata.PingRequest, opts ...grpc.CallOption) (*tabletmanagerdata.PingResponse, error)
@@ -140,7 +141,7 @@ func NewTabletManagerClient(cc *grpc.ClientConn) TabletManagerClient {
 
 func (c *tabletManagerClient) Ping(ctx context.Context, in *tabletmanagerdata.PingRequest, opts ...grpc.CallOption) (*tabletmanagerdata.PingResponse, error) {
 	out := new(tabletmanagerdata.PingResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/Ping", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/Ping", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -149,7 +150,7 @@ func (c *tabletManagerClient) Ping(ctx context.Context, in *tabletmanagerdata.Pi
 
 func (c *tabletManagerClient) Sleep(ctx context.Context, in *tabletmanagerdata.SleepRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SleepResponse, error) {
 	out := new(tabletmanagerdata.SleepResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/Sleep", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/Sleep", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -158,7 +159,7 @@ func (c *tabletManagerClient) Sleep(ctx context.Context, in *tabletmanagerdata.S
 
 func (c *tabletManagerClient) ExecuteHook(ctx context.Context, in *tabletmanagerdata.ExecuteHookRequest, opts ...grpc.CallOption) (*tabletmanagerdata.ExecuteHookResponse, error) {
 	out := new(tabletmanagerdata.ExecuteHookResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ExecuteHook", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ExecuteHook", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -167,7 +168,7 @@ func (c *tabletManagerClient) ExecuteHook(ctx context.Context, in *tabletmanager
 
 func (c *tabletManagerClient) GetSchema(ctx context.Context, in *tabletmanagerdata.GetSchemaRequest, opts ...grpc.CallOption) (*tabletmanagerdata.GetSchemaResponse, error) {
 	out := new(tabletmanagerdata.GetSchemaResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/GetSchema", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/GetSchema", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -176,7 +177,7 @@ func (c *tabletManagerClient) GetSchema(ctx context.Context, in *tabletmanagerda
 
 func (c *tabletManagerClient) GetPermissions(ctx context.Context, in *tabletmanagerdata.GetPermissionsRequest, opts ...grpc.CallOption) (*tabletmanagerdata.GetPermissionsResponse, error) {
 	out := new(tabletmanagerdata.GetPermissionsResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/GetPermissions", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/GetPermissions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -185,7 +186,7 @@ func (c *tabletManagerClient) GetPermissions(ctx context.Context, in *tabletmana
 
 func (c *tabletManagerClient) SetReadOnly(ctx context.Context, in *tabletmanagerdata.SetReadOnlyRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SetReadOnlyResponse, error) {
 	out := new(tabletmanagerdata.SetReadOnlyResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SetReadOnly", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SetReadOnly", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -194,7 +195,7 @@ func (c *tabletManagerClient) SetReadOnly(ctx context.Context, in *tabletmanager
 
 func (c *tabletManagerClient) SetReadWrite(ctx context.Context, in *tabletmanagerdata.SetReadWriteRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SetReadWriteResponse, error) {
 	out := new(tabletmanagerdata.SetReadWriteResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SetReadWrite", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SetReadWrite", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -203,7 +204,7 @@ func (c *tabletManagerClient) SetReadWrite(ctx context.Context, in *tabletmanage
 
 func (c *tabletManagerClient) ChangeType(ctx context.Context, in *tabletmanagerdata.ChangeTypeRequest, opts ...grpc.CallOption) (*tabletmanagerdata.ChangeTypeResponse, error) {
 	out := new(tabletmanagerdata.ChangeTypeResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ChangeType", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ChangeType", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -212,7 +213,7 @@ func (c *tabletManagerClient) ChangeType(ctx context.Context, in *tabletmanagerd
 
 func (c *tabletManagerClient) RefreshState(ctx context.Context, in *tabletmanagerdata.RefreshStateRequest, opts ...grpc.CallOption) (*tabletmanagerdata.RefreshStateResponse, error) {
 	out := new(tabletmanagerdata.RefreshStateResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/RefreshState", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/RefreshState", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -221,7 +222,7 @@ func (c *tabletManagerClient) RefreshState(ctx context.Context, in *tabletmanage
 
 func (c *tabletManagerClient) RunHealthCheck(ctx context.Context, in *tabletmanagerdata.RunHealthCheckRequest, opts ...grpc.CallOption) (*tabletmanagerdata.RunHealthCheckResponse, error) {
 	out := new(tabletmanagerdata.RunHealthCheckResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/RunHealthCheck", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/RunHealthCheck", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -230,7 +231,7 @@ func (c *tabletManagerClient) RunHealthCheck(ctx context.Context, in *tabletmana
 
 func (c *tabletManagerClient) IgnoreHealthError(ctx context.Context, in *tabletmanagerdata.IgnoreHealthErrorRequest, opts ...grpc.CallOption) (*tabletmanagerdata.IgnoreHealthErrorResponse, error) {
 	out := new(tabletmanagerdata.IgnoreHealthErrorResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/IgnoreHealthError", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/IgnoreHealthError", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -239,7 +240,7 @@ func (c *tabletManagerClient) IgnoreHealthError(ctx context.Context, in *tabletm
 
 func (c *tabletManagerClient) ReloadSchema(ctx context.Context, in *tabletmanagerdata.ReloadSchemaRequest, opts ...grpc.CallOption) (*tabletmanagerdata.ReloadSchemaResponse, error) {
 	out := new(tabletmanagerdata.ReloadSchemaResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ReloadSchema", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ReloadSchema", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -248,7 +249,7 @@ func (c *tabletManagerClient) ReloadSchema(ctx context.Context, in *tabletmanage
 
 func (c *tabletManagerClient) PreflightSchema(ctx context.Context, in *tabletmanagerdata.PreflightSchemaRequest, opts ...grpc.CallOption) (*tabletmanagerdata.PreflightSchemaResponse, error) {
 	out := new(tabletmanagerdata.PreflightSchemaResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/PreflightSchema", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/PreflightSchema", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -257,7 +258,7 @@ func (c *tabletManagerClient) PreflightSchema(ctx context.Context, in *tabletman
 
 func (c *tabletManagerClient) ApplySchema(ctx context.Context, in *tabletmanagerdata.ApplySchemaRequest, opts ...grpc.CallOption) (*tabletmanagerdata.ApplySchemaResponse, error) {
 	out := new(tabletmanagerdata.ApplySchemaResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ApplySchema", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ApplySchema", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -266,7 +267,7 @@ func (c *tabletManagerClient) ApplySchema(ctx context.Context, in *tabletmanager
 
 func (c *tabletManagerClient) ExecuteFetchAsDba(ctx context.Context, in *tabletmanagerdata.ExecuteFetchAsDbaRequest, opts ...grpc.CallOption) (*tabletmanagerdata.ExecuteFetchAsDbaResponse, error) {
 	out := new(tabletmanagerdata.ExecuteFetchAsDbaResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ExecuteFetchAsDba", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ExecuteFetchAsDba", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -275,7 +276,7 @@ func (c *tabletManagerClient) ExecuteFetchAsDba(ctx context.Context, in *tabletm
 
 func (c *tabletManagerClient) ExecuteFetchAsAllPrivs(ctx context.Context, in *tabletmanagerdata.ExecuteFetchAsAllPrivsRequest, opts ...grpc.CallOption) (*tabletmanagerdata.ExecuteFetchAsAllPrivsResponse, error) {
 	out := new(tabletmanagerdata.ExecuteFetchAsAllPrivsResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ExecuteFetchAsAllPrivs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ExecuteFetchAsAllPrivs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -284,7 +285,7 @@ func (c *tabletManagerClient) ExecuteFetchAsAllPrivs(ctx context.Context, in *ta
 
 func (c *tabletManagerClient) ExecuteFetchAsApp(ctx context.Context, in *tabletmanagerdata.ExecuteFetchAsAppRequest, opts ...grpc.CallOption) (*tabletmanagerdata.ExecuteFetchAsAppResponse, error) {
 	out := new(tabletmanagerdata.ExecuteFetchAsAppResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ExecuteFetchAsApp", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ExecuteFetchAsApp", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -293,7 +294,7 @@ func (c *tabletManagerClient) ExecuteFetchAsApp(ctx context.Context, in *tabletm
 
 func (c *tabletManagerClient) SlaveStatus(ctx context.Context, in *tabletmanagerdata.SlaveStatusRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SlaveStatusResponse, error) {
 	out := new(tabletmanagerdata.SlaveStatusResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SlaveStatus", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SlaveStatus", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -302,7 +303,7 @@ func (c *tabletManagerClient) SlaveStatus(ctx context.Context, in *tabletmanager
 
 func (c *tabletManagerClient) MasterPosition(ctx context.Context, in *tabletmanagerdata.MasterPositionRequest, opts ...grpc.CallOption) (*tabletmanagerdata.MasterPositionResponse, error) {
 	out := new(tabletmanagerdata.MasterPositionResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/MasterPosition", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/MasterPosition", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -311,7 +312,7 @@ func (c *tabletManagerClient) MasterPosition(ctx context.Context, in *tabletmana
 
 func (c *tabletManagerClient) StopSlave(ctx context.Context, in *tabletmanagerdata.StopSlaveRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StopSlaveResponse, error) {
 	out := new(tabletmanagerdata.StopSlaveResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StopSlave", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StopSlave", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -320,7 +321,7 @@ func (c *tabletManagerClient) StopSlave(ctx context.Context, in *tabletmanagerda
 
 func (c *tabletManagerClient) StopSlaveMinimum(ctx context.Context, in *tabletmanagerdata.StopSlaveMinimumRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StopSlaveMinimumResponse, error) {
 	out := new(tabletmanagerdata.StopSlaveMinimumResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StopSlaveMinimum", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StopSlaveMinimum", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -329,7 +330,7 @@ func (c *tabletManagerClient) StopSlaveMinimum(ctx context.Context, in *tabletma
 
 func (c *tabletManagerClient) StartSlave(ctx context.Context, in *tabletmanagerdata.StartSlaveRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StartSlaveResponse, error) {
 	out := new(tabletmanagerdata.StartSlaveResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StartSlave", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StartSlave", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -338,7 +339,7 @@ func (c *tabletManagerClient) StartSlave(ctx context.Context, in *tabletmanagerd
 
 func (c *tabletManagerClient) TabletExternallyReparented(ctx context.Context, in *tabletmanagerdata.TabletExternallyReparentedRequest, opts ...grpc.CallOption) (*tabletmanagerdata.TabletExternallyReparentedResponse, error) {
 	out := new(tabletmanagerdata.TabletExternallyReparentedResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/TabletExternallyReparented", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/TabletExternallyReparented", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -347,7 +348,7 @@ func (c *tabletManagerClient) TabletExternallyReparented(ctx context.Context, in
 
 func (c *tabletManagerClient) TabletExternallyElected(ctx context.Context, in *tabletmanagerdata.TabletExternallyElectedRequest, opts ...grpc.CallOption) (*tabletmanagerdata.TabletExternallyElectedResponse, error) {
 	out := new(tabletmanagerdata.TabletExternallyElectedResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/TabletExternallyElected", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/TabletExternallyElected", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -356,7 +357,7 @@ func (c *tabletManagerClient) TabletExternallyElected(ctx context.Context, in *t
 
 func (c *tabletManagerClient) GetSlaves(ctx context.Context, in *tabletmanagerdata.GetSlavesRequest, opts ...grpc.CallOption) (*tabletmanagerdata.GetSlavesResponse, error) {
 	out := new(tabletmanagerdata.GetSlavesResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/GetSlaves", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/GetSlaves", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -365,7 +366,7 @@ func (c *tabletManagerClient) GetSlaves(ctx context.Context, in *tabletmanagerda
 
 func (c *tabletManagerClient) VReplicationExec(ctx context.Context, in *tabletmanagerdata.VReplicationExecRequest, opts ...grpc.CallOption) (*tabletmanagerdata.VReplicationExecResponse, error) {
 	out := new(tabletmanagerdata.VReplicationExecResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/VReplicationExec", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/VReplicationExec", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -374,7 +375,7 @@ func (c *tabletManagerClient) VReplicationExec(ctx context.Context, in *tabletma
 
 func (c *tabletManagerClient) VReplicationWaitForPos(ctx context.Context, in *tabletmanagerdata.VReplicationWaitForPosRequest, opts ...grpc.CallOption) (*tabletmanagerdata.VReplicationWaitForPosResponse, error) {
 	out := new(tabletmanagerdata.VReplicationWaitForPosResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/VReplicationWaitForPos", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/VReplicationWaitForPos", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -383,7 +384,7 @@ func (c *tabletManagerClient) VReplicationWaitForPos(ctx context.Context, in *ta
 
 func (c *tabletManagerClient) ResetReplication(ctx context.Context, in *tabletmanagerdata.ResetReplicationRequest, opts ...grpc.CallOption) (*tabletmanagerdata.ResetReplicationResponse, error) {
 	out := new(tabletmanagerdata.ResetReplicationResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ResetReplication", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/ResetReplication", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -392,7 +393,7 @@ func (c *tabletManagerClient) ResetReplication(ctx context.Context, in *tabletma
 
 func (c *tabletManagerClient) InitMaster(ctx context.Context, in *tabletmanagerdata.InitMasterRequest, opts ...grpc.CallOption) (*tabletmanagerdata.InitMasterResponse, error) {
 	out := new(tabletmanagerdata.InitMasterResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/InitMaster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/InitMaster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -401,7 +402,7 @@ func (c *tabletManagerClient) InitMaster(ctx context.Context, in *tabletmanagerd
 
 func (c *tabletManagerClient) PopulateReparentJournal(ctx context.Context, in *tabletmanagerdata.PopulateReparentJournalRequest, opts ...grpc.CallOption) (*tabletmanagerdata.PopulateReparentJournalResponse, error) {
 	out := new(tabletmanagerdata.PopulateReparentJournalResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/PopulateReparentJournal", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/PopulateReparentJournal", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -410,7 +411,7 @@ func (c *tabletManagerClient) PopulateReparentJournal(ctx context.Context, in *t
 
 func (c *tabletManagerClient) InitSlave(ctx context.Context, in *tabletmanagerdata.InitSlaveRequest, opts ...grpc.CallOption) (*tabletmanagerdata.InitSlaveResponse, error) {
 	out := new(tabletmanagerdata.InitSlaveResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/InitSlave", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/InitSlave", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -419,7 +420,7 @@ func (c *tabletManagerClient) InitSlave(ctx context.Context, in *tabletmanagerda
 
 func (c *tabletManagerClient) DemoteMaster(ctx context.Context, in *tabletmanagerdata.DemoteMasterRequest, opts ...grpc.CallOption) (*tabletmanagerdata.DemoteMasterResponse, error) {
 	out := new(tabletmanagerdata.DemoteMasterResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/DemoteMaster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/DemoteMaster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -428,7 +429,7 @@ func (c *tabletManagerClient) DemoteMaster(ctx context.Context, in *tabletmanage
 
 func (c *tabletManagerClient) PromoteSlaveWhenCaughtUp(ctx context.Context, in *tabletmanagerdata.PromoteSlaveWhenCaughtUpRequest, opts ...grpc.CallOption) (*tabletmanagerdata.PromoteSlaveWhenCaughtUpResponse, error) {
 	out := new(tabletmanagerdata.PromoteSlaveWhenCaughtUpResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/PromoteSlaveWhenCaughtUp", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/PromoteSlaveWhenCaughtUp", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -437,7 +438,7 @@ func (c *tabletManagerClient) PromoteSlaveWhenCaughtUp(ctx context.Context, in *
 
 func (c *tabletManagerClient) SlaveWasPromoted(ctx context.Context, in *tabletmanagerdata.SlaveWasPromotedRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SlaveWasPromotedResponse, error) {
 	out := new(tabletmanagerdata.SlaveWasPromotedResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SlaveWasPromoted", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SlaveWasPromoted", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -446,7 +447,7 @@ func (c *tabletManagerClient) SlaveWasPromoted(ctx context.Context, in *tabletma
 
 func (c *tabletManagerClient) SetMaster(ctx context.Context, in *tabletmanagerdata.SetMasterRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SetMasterResponse, error) {
 	out := new(tabletmanagerdata.SetMasterResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SetMaster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SetMaster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -455,7 +456,7 @@ func (c *tabletManagerClient) SetMaster(ctx context.Context, in *tabletmanagerda
 
 func (c *tabletManagerClient) SlaveWasRestarted(ctx context.Context, in *tabletmanagerdata.SlaveWasRestartedRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SlaveWasRestartedResponse, error) {
 	out := new(tabletmanagerdata.SlaveWasRestartedResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SlaveWasRestarted", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SlaveWasRestarted", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -464,7 +465,7 @@ func (c *tabletManagerClient) SlaveWasRestarted(ctx context.Context, in *tabletm
 
 func (c *tabletManagerClient) StopReplicationAndGetStatus(ctx context.Context, in *tabletmanagerdata.StopReplicationAndGetStatusRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StopReplicationAndGetStatusResponse, error) {
 	out := new(tabletmanagerdata.StopReplicationAndGetStatusResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StopReplicationAndGetStatus", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StopReplicationAndGetStatus", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -473,7 +474,7 @@ func (c *tabletManagerClient) StopReplicationAndGetStatus(ctx context.Context, i
 
 func (c *tabletManagerClient) PromoteSlave(ctx context.Context, in *tabletmanagerdata.PromoteSlaveRequest, opts ...grpc.CallOption) (*tabletmanagerdata.PromoteSlaveResponse, error) {
 	out := new(tabletmanagerdata.PromoteSlaveResponse)
-	err := grpc.Invoke(ctx, "/tabletmanagerservice.TabletManager/PromoteSlave", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/PromoteSlave", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -481,7 +482,7 @@ func (c *tabletManagerClient) PromoteSlave(ctx context.Context, in *tabletmanage
 }
 
 func (c *tabletManagerClient) Backup(ctx context.Context, in *tabletmanagerdata.BackupRequest, opts ...grpc.CallOption) (TabletManager_BackupClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TabletManager_serviceDesc.Streams[0], c.cc, "/tabletmanagerservice.TabletManager/Backup", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TabletManager_serviceDesc.Streams[0], "/tabletmanagerservice.TabletManager/Backup", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -513,7 +514,7 @@ func (x *tabletManagerBackupClient) Recv() (*tabletmanagerdata.BackupResponse, e
 }
 
 func (c *tabletManagerClient) RestoreFromBackup(ctx context.Context, in *tabletmanagerdata.RestoreFromBackupRequest, opts ...grpc.CallOption) (TabletManager_RestoreFromBackupClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TabletManager_serviceDesc.Streams[1], c.cc, "/tabletmanagerservice.TabletManager/RestoreFromBackup", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TabletManager_serviceDesc.Streams[1], "/tabletmanagerservice.TabletManager/RestoreFromBackup", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -544,8 +545,7 @@ func (x *tabletManagerRestoreFromBackupClient) Recv() (*tabletmanagerdata.Restor
 	return m, nil
 }
 
-// Server API for TabletManager service
-
+// TabletManagerServer is the server API for TabletManager service.
 type TabletManagerServer interface {
 	// Ping returns the input payload
 	Ping(context.Context, *tabletmanagerdata.PingRequest) (*tabletmanagerdata.PingResponse, error)
diff --git a/go/vt/proto/throttlerdata/throttlerdata.pb.go b/go/vt/proto/throttlerdata/throttlerdata.pb.go
index 812a34836c5..d1bd1620f46 100644
--- a/go/vt/proto/throttlerdata/throttlerdata.pb.go
+++ b/go/vt/proto/throttlerdata/throttlerdata.pb.go
@@ -53,7 +53,7 @@ var xxx_messageInfo_MaxRatesRequest proto.InternalMessageInfo
 type MaxRatesResponse struct {
 	// max_rates returns the max rate for each throttler. It's keyed by the
 	// throttler name.
-	Rates                map[string]int64 `protobuf:"bytes,1,rep,name=rates" json:"rates,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	Rates                map[string]int64 `protobuf:"bytes,1,rep,name=rates,proto3" json:"rates,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:"-"`
@@ -92,7 +92,7 @@ func (m *MaxRatesResponse) GetRates() map[string]int64 {
 
 // SetMaxRateRequest is the payload for the SetMaxRate RPC.
 type SetMaxRateRequest struct {
-	Rate                 int64    `protobuf:"varint,1,opt,name=rate" json:"rate,omitempty"`
+	Rate                 int64    `protobuf:"varint,1,opt,name=rate,proto3" json:"rate,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -132,7 +132,7 @@ func (m *SetMaxRateRequest) GetRate() int64 {
 // SetMaxRateResponse is returned by the SetMaxRate RPC.
 type SetMaxRateResponse struct {
 	// names is the list of throttler names which were updated.
-	Names                []string `protobuf:"bytes,1,rep,name=names" json:"names,omitempty"`
+	Names                []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -178,7 +178,7 @@ type Configuration struct {
 	// If it is within the target, it tries to increase the throttler
 	// rate, otherwise it will lower it based on an educated guess of the
 	// slave throughput.
-	TargetReplicationLagSec int64 `protobuf:"varint,1,opt,name=target_replication_lag_sec,json=targetReplicationLagSec" json:"target_replication_lag_sec,omitempty"`
+	TargetReplicationLagSec int64 `protobuf:"varint,1,opt,name=target_replication_lag_sec,json=targetReplicationLagSec,proto3" json:"target_replication_lag_sec,omitempty"`
 	// max_replication_lag_sec is meant as a last resort.
 	// By default, the module tries to find out the system maximum capacity while
 	// trying to keep the replication lag around "target_replication_lag_sec".
@@ -187,9 +187,9 @@ type Configuration struct {
 	// But if the lag goes above this field's value we will go into an "emergency"
 	// state and throttle more aggressively (see "emergency_decrease" below).
 	// This is the only way to ensure that the system will recover.
-	MaxReplicationLagSec int64 `protobuf:"varint,2,opt,name=max_replication_lag_sec,json=maxReplicationLagSec" json:"max_replication_lag_sec,omitempty"`
+	MaxReplicationLagSec int64 `protobuf:"varint,2,opt,name=max_replication_lag_sec,json=maxReplicationLagSec,proto3" json:"max_replication_lag_sec,omitempty"`
 	// initial_rate is the rate at which the module will start.
-	InitialRate int64 `protobuf:"varint,3,opt,name=initial_rate,json=initialRate" json:"initial_rate,omitempty"`
+	InitialRate int64 `protobuf:"varint,3,opt,name=initial_rate,json=initialRate,proto3" json:"initial_rate,omitempty"`
 	// max_increase defines by how much we will increase the rate
 	// e.g. 0.05 increases the rate by 5% while 1.0 by 100%.
 	// Note that any increase will let the system wait for at least
@@ -198,20 +198,20 @@ type Configuration struct {
 	// (If the system was already at its maximum capacity (e.g. 1k QPS) and we
 	// increase the rate by e.g. 5% to 1050 QPS, it will take 20 seconds until
 	// 1000 extra queries are buffered and the lag increases by 1 second.)
-	MaxIncrease float64 `protobuf:"fixed64,4,opt,name=max_increase,json=maxIncrease" json:"max_increase,omitempty"`
+	MaxIncrease float64 `protobuf:"fixed64,4,opt,name=max_increase,json=maxIncrease,proto3" json:"max_increase,omitempty"`
 	// emergency_decrease defines by how much we will decrease the current rate
 	// if the observed replication lag is above "max_replication_lag_sec".
 	// E.g. 0.50 decreases the current rate by 50%.
-	EmergencyDecrease float64 `protobuf:"fixed64,5,opt,name=emergency_decrease,json=emergencyDecrease" json:"emergency_decrease,omitempty"`
+	EmergencyDecrease float64 `protobuf:"fixed64,5,opt,name=emergency_decrease,json=emergencyDecrease,proto3" json:"emergency_decrease,omitempty"`
 	// min_duration_between_increases_sec specifies how long we'll wait at least
 	// for the last rate increase to have an effect on the system.
-	MinDurationBetweenIncreasesSec int64 `protobuf:"varint,6,opt,name=min_duration_between_increases_sec,json=minDurationBetweenIncreasesSec" json:"min_duration_between_increases_sec,omitempty"`
+	MinDurationBetweenIncreasesSec int64 `protobuf:"varint,6,opt,name=min_duration_between_increases_sec,json=minDurationBetweenIncreasesSec,proto3" json:"min_duration_between_increases_sec,omitempty"`
 	// max_duration_between_increases_sec specifies how long we'll wait at most
 	// for the last rate increase to have an effect on the system.
-	MaxDurationBetweenIncreasesSec int64 `protobuf:"varint,7,opt,name=max_duration_between_increases_sec,json=maxDurationBetweenIncreasesSec" json:"max_duration_between_increases_sec,omitempty"`
+	MaxDurationBetweenIncreasesSec int64 `protobuf:"varint,7,opt,name=max_duration_between_increases_sec,json=maxDurationBetweenIncreasesSec,proto3" json:"max_duration_between_increases_sec,omitempty"`
 	// min_duration_between_decreases_sec specifies how long we'll wait at least
 	// for the last rate decrease to have an effect on the system.
-	MinDurationBetweenDecreasesSec int64 `protobuf:"varint,8,opt,name=min_duration_between_decreases_sec,json=minDurationBetweenDecreasesSec" json:"min_duration_between_decreases_sec,omitempty"`
+	MinDurationBetweenDecreasesSec int64 `protobuf:"varint,8,opt,name=min_duration_between_decreases_sec,json=minDurationBetweenDecreasesSec,proto3" json:"min_duration_between_decreases_sec,omitempty"`
 	// spread_backlog_across_sec is used when we set the throttler rate after
 	// we guessed the rate of a slave and determined its backlog.
 	// For example, at a guessed rate of 100 QPS and a lag of 10s, the replica has
@@ -222,16 +222,16 @@ type Configuration struct {
 	// For example, for a backlog of 1000 queries spread over 5s means that we
 	// have to further reduce the rate by 200 QPS or the backlog will not be
 	// processed within the 5 seconds.
-	SpreadBacklogAcrossSec int64 `protobuf:"varint,9,opt,name=spread_backlog_across_sec,json=spreadBacklogAcrossSec" json:"spread_backlog_across_sec,omitempty"`
+	SpreadBacklogAcrossSec int64 `protobuf:"varint,9,opt,name=spread_backlog_across_sec,json=spreadBacklogAcrossSec,proto3" json:"spread_backlog_across_sec,omitempty"`
 	// ignore_n_slowest_replicas will ignore replication lag updates from the
 	// N slowest REPLICA tablets. Under certain circumstances, replicas are still
 	// considered e.g. a) if the lag is at most max_replication_lag_sec, b) there
 	// are less than N+1 replicas or c) the lag increased on each replica such
 	// that all replicas were ignored in a row.
-	IgnoreNSlowestReplicas int32 `protobuf:"varint,10,opt,name=ignore_n_slowest_replicas,json=ignoreNSlowestReplicas" json:"ignore_n_slowest_replicas,omitempty"`
+	IgnoreNSlowestReplicas int32 `protobuf:"varint,10,opt,name=ignore_n_slowest_replicas,json=ignoreNSlowestReplicas,proto3" json:"ignore_n_slowest_replicas,omitempty"`
 	// ignore_n_slowest_rdonlys does the same thing as ignore_n_slowest_replicas
 	// but for RDONLY tablets. Note that these two settings are independent.
-	IgnoreNSlowestRdonlys int32 `protobuf:"varint,11,opt,name=ignore_n_slowest_rdonlys,json=ignoreNSlowestRdonlys" json:"ignore_n_slowest_rdonlys,omitempty"`
+	IgnoreNSlowestRdonlys int32 `protobuf:"varint,11,opt,name=ignore_n_slowest_rdonlys,json=ignoreNSlowestRdonlys,proto3" json:"ignore_n_slowest_rdonlys,omitempty"`
 	// age_bad_rate_after_sec is the duration after which an unchanged bad rate
 	// will "age out" and increase by "bad_rate_increase".
 	// Bad rates are tracked by the code in memory.go and serve as an upper bound
@@ -239,17 +239,17 @@ type Configuration struct {
 	// try known too high (bad) rates over and over again.
 	// To avoid that temporary degradations permanently reduce the maximum rate,
 	// a stable bad rate "ages out" after "age_bad_rate_after_sec".
-	AgeBadRateAfterSec int64 `protobuf:"varint,12,opt,name=age_bad_rate_after_sec,json=ageBadRateAfterSec" json:"age_bad_rate_after_sec,omitempty"`
+	AgeBadRateAfterSec int64 `protobuf:"varint,12,opt,name=age_bad_rate_after_sec,json=ageBadRateAfterSec,proto3" json:"age_bad_rate_after_sec,omitempty"`
 	// bad_rate_increase defines the percentage by which a bad rate will be
 	// increased when it's aging out.
-	BadRateIncrease float64 `protobuf:"fixed64,13,opt,name=bad_rate_increase,json=badRateIncrease" json:"bad_rate_increase,omitempty"`
+	BadRateIncrease float64 `protobuf:"fixed64,13,opt,name=bad_rate_increase,json=badRateIncrease,proto3" json:"bad_rate_increase,omitempty"`
 	// max_rate_approach_threshold is the fraction of the current rate limit that the actual
 	// rate must exceed for the throttler to increase the limit when the replication lag
 	// is below target_replication_lag_sec. For example, assuming the actual replication lag
 	// is below target_replication_lag_sec, if the current rate limit is 100, then the actual
 	// rate must exceed 100*max_rate_approach_threshold for the throttler to increase the current
 	// limit.
-	MaxRateApproachThreshold float64  `protobuf:"fixed64,14,opt,name=max_rate_approach_threshold,json=maxRateApproachThreshold" json:"max_rate_approach_threshold,omitempty"`
+	MaxRateApproachThreshold float64  `protobuf:"fixed64,14,opt,name=max_rate_approach_threshold,json=maxRateApproachThreshold,proto3" json:"max_rate_approach_threshold,omitempty"`
 	XXX_NoUnkeyedLiteral     struct{} `json:"-"`
 	XXX_unrecognized         []byte   `json:"-"`
 	XXX_sizecache            int32    `json:"-"`
@@ -381,7 +381,7 @@ func (m *Configuration) GetMaxRateApproachThreshold() float64 {
 type GetConfigurationRequest struct {
 	// throttler_name specifies which throttler to select. If empty, all active
 	// throttlers will be selected.
-	ThrottlerName        string   `protobuf:"bytes,1,opt,name=throttler_name,json=throttlerName" json:"throttler_name,omitempty"`
+	ThrottlerName        string   `protobuf:"bytes,1,opt,name=throttler_name,json=throttlerName,proto3" json:"throttler_name,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -422,7 +422,7 @@ func (m *GetConfigurationRequest) GetThrottlerName() string {
 type GetConfigurationResponse struct {
 	// max_rates returns the configurations for each throttler.
 	// It's keyed by the throttler name.
-	Configurations       map[string]*Configuration `protobuf:"bytes,1,rep,name=configurations" json:"configurations,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Configurations       map[string]*Configuration `protobuf:"bytes,1,rep,name=configurations,proto3" json:"configurations,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:"-"`
@@ -463,12 +463,12 @@ func (m *GetConfigurationResponse) GetConfigurations() map[string]*Configuration
 type UpdateConfigurationRequest struct {
 	// throttler_name specifies which throttler to update. If empty, all active
 	// throttlers will be updated.
-	ThrottlerName string `protobuf:"bytes,1,opt,name=throttler_name,json=throttlerName" json:"throttler_name,omitempty"`
+	ThrottlerName string `protobuf:"bytes,1,opt,name=throttler_name,json=throttlerName,proto3" json:"throttler_name,omitempty"`
 	// configuration is the new (partial) configuration.
-	Configuration *Configuration `protobuf:"bytes,2,opt,name=configuration" json:"configuration,omitempty"`
+	Configuration *Configuration `protobuf:"bytes,2,opt,name=configuration,proto3" json:"configuration,omitempty"`
 	// copy_zero_values specifies whether fields with zero values should be copied
 	// as well.
-	CopyZeroValues       bool     `protobuf:"varint,3,opt,name=copy_zero_values,json=copyZeroValues" json:"copy_zero_values,omitempty"`
+	CopyZeroValues       bool     `protobuf:"varint,3,opt,name=copy_zero_values,json=copyZeroValues,proto3" json:"copy_zero_values,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -522,7 +522,7 @@ func (m *UpdateConfigurationRequest) GetCopyZeroValues() bool {
 // UpdateConfigurationResponse is returned by the UpdateConfiguration RPC.
 type UpdateConfigurationResponse struct {
 	// names is the list of throttler names which were updated.
-	Names                []string `protobuf:"bytes,1,rep,name=names" json:"names,omitempty"`
+	Names                []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -563,7 +563,7 @@ func (m *UpdateConfigurationResponse) GetNames() []string {
 type ResetConfigurationRequest struct {
 	// throttler_name specifies which throttler to reset. If empty, all active
 	// throttlers will be reset.
-	ThrottlerName        string   `protobuf:"bytes,1,opt,name=throttler_name,json=throttlerName" json:"throttler_name,omitempty"`
+	ThrottlerName        string   `protobuf:"bytes,1,opt,name=throttler_name,json=throttlerName,proto3" json:"throttler_name,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -603,7 +603,7 @@ func (m *ResetConfigurationRequest) GetThrottlerName() string {
 // ResetConfigurationResponse is returned by the ResetConfiguration RPC.
 type ResetConfigurationResponse struct {
 	// names is the list of throttler names which were updated.
-	Names                []string `protobuf:"bytes,1,rep,name=names" json:"names,omitempty"`
+	Names                []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
diff --git a/go/vt/proto/throttlerservice/throttlerservice.pb.go b/go/vt/proto/throttlerservice/throttlerservice.pb.go
index b5537799e0a..ecbe7cdac25 100644
--- a/go/vt/proto/throttlerservice/throttlerservice.pb.go
+++ b/go/vt/proto/throttlerservice/throttlerservice.pb.go
@@ -32,8 +32,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Throttler service
-
+// ThrottlerClient is the client API for Throttler service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ThrottlerClient interface {
 	// MaxRates returns the current max rate for each throttler of the process.
 	MaxRates(ctx context.Context, in *throttlerdata.MaxRatesRequest, opts ...grpc.CallOption) (*throttlerdata.MaxRatesResponse, error)
@@ -65,7 +66,7 @@ func NewThrottlerClient(cc *grpc.ClientConn) ThrottlerClient {
 
 func (c *throttlerClient) MaxRates(ctx context.Context, in *throttlerdata.MaxRatesRequest, opts ...grpc.CallOption) (*throttlerdata.MaxRatesResponse, error) {
 	out := new(throttlerdata.MaxRatesResponse)
-	err := grpc.Invoke(ctx, "/throttlerservice.Throttler/MaxRates", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/throttlerservice.Throttler/MaxRates", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -74,7 +75,7 @@ func (c *throttlerClient) MaxRates(ctx context.Context, in *throttlerdata.MaxRat
 
 func (c *throttlerClient) SetMaxRate(ctx context.Context, in *throttlerdata.SetMaxRateRequest, opts ...grpc.CallOption) (*throttlerdata.SetMaxRateResponse, error) {
 	out := new(throttlerdata.SetMaxRateResponse)
-	err := grpc.Invoke(ctx, "/throttlerservice.Throttler/SetMaxRate", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/throttlerservice.Throttler/SetMaxRate", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -83,7 +84,7 @@ func (c *throttlerClient) SetMaxRate(ctx context.Context, in *throttlerdata.SetM
 
 func (c *throttlerClient) GetConfiguration(ctx context.Context, in *throttlerdata.GetConfigurationRequest, opts ...grpc.CallOption) (*throttlerdata.GetConfigurationResponse, error) {
 	out := new(throttlerdata.GetConfigurationResponse)
-	err := grpc.Invoke(ctx, "/throttlerservice.Throttler/GetConfiguration", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/throttlerservice.Throttler/GetConfiguration", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -92,7 +93,7 @@ func (c *throttlerClient) GetConfiguration(ctx context.Context, in *throttlerdat
 
 func (c *throttlerClient) UpdateConfiguration(ctx context.Context, in *throttlerdata.UpdateConfigurationRequest, opts ...grpc.CallOption) (*throttlerdata.UpdateConfigurationResponse, error) {
 	out := new(throttlerdata.UpdateConfigurationResponse)
-	err := grpc.Invoke(ctx, "/throttlerservice.Throttler/UpdateConfiguration", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/throttlerservice.Throttler/UpdateConfiguration", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -101,15 +102,14 @@ func (c *throttlerClient) UpdateConfiguration(ctx context.Context, in *throttler
 
 func (c *throttlerClient) ResetConfiguration(ctx context.Context, in *throttlerdata.ResetConfigurationRequest, opts ...grpc.CallOption) (*throttlerdata.ResetConfigurationResponse, error) {
 	out := new(throttlerdata.ResetConfigurationResponse)
-	err := grpc.Invoke(ctx, "/throttlerservice.Throttler/ResetConfiguration", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/throttlerservice.Throttler/ResetConfiguration", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Throttler service
-
+// ThrottlerServer is the server API for Throttler service.
 type ThrottlerServer interface {
 	// MaxRates returns the current max rate for each throttler of the process.
 	MaxRates(context.Context, *throttlerdata.MaxRatesRequest) (*throttlerdata.MaxRatesResponse, error)
diff --git a/go/vt/proto/topodata/topodata.pb.go b/go/vt/proto/topodata/topodata.pb.go
index 6fe977f8396..d3903dbfd8f 100644
--- a/go/vt/proto/topodata/topodata.pb.go
+++ b/go/vt/proto/topodata/topodata.pb.go
@@ -171,10 +171,10 @@ func (m *KeyRange) GetEnd() []byte {
 // TabletAlias is a globally unique tablet identifier.
 type TabletAlias struct {
 	// cell is the cell (or datacenter) the tablet is in
-	Cell string `protobuf:"bytes,1,opt,name=cell" json:"cell,omitempty"`
+	Cell string `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
 	// uid is a unique id for this tablet within the shard
 	// (this is the MySQL server id as well).
-	Uid                  uint32   `protobuf:"varint,2,opt,name=uid" json:"uid,omitempty"`
+	Uid                  uint32   `protobuf:"varint,2,opt,name=uid,proto3" json:"uid,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -221,36 +221,36 @@ func (m *TabletAlias) GetUid() uint32 {
 // Tablet represents information about a running instance of vttablet.
 type Tablet struct {
 	// alias is the unique name of the tablet.
-	Alias *TabletAlias `protobuf:"bytes,1,opt,name=alias" json:"alias,omitempty"`
+	Alias *TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
 	// Fully qualified domain name of the host.
-	Hostname string `protobuf:"bytes,2,opt,name=hostname" json:"hostname,omitempty"`
+	Hostname string `protobuf:"bytes,2,opt,name=hostname,proto3" json:"hostname,omitempty"`
 	// Map of named ports. Normally this should include vt and grpc.
 	// Going forward, the mysql port will be stored in mysql_port
 	// instead of here.
 	// For accessing mysql port, use topoproto.MysqlPort to fetch, and
 	// topoproto.SetMysqlPort to set. These wrappers will ensure
 	// legacy behavior is supported.
-	PortMap map[string]int32 `protobuf:"bytes,4,rep,name=port_map,json=portMap" json:"port_map,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	PortMap map[string]int32 `protobuf:"bytes,4,rep,name=port_map,json=portMap,proto3" json:"port_map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 	// Keyspace name.
-	Keyspace string `protobuf:"bytes,5,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,5,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Shard name. If range based sharding is used, it should match
 	// key_range.
-	Shard string `protobuf:"bytes,6,opt,name=shard" json:"shard,omitempty"`
+	Shard string `protobuf:"bytes,6,opt,name=shard,proto3" json:"shard,omitempty"`
 	// If range based sharding is used, range for the tablet's shard.
-	KeyRange *KeyRange `protobuf:"bytes,7,opt,name=key_range,json=keyRange" json:"key_range,omitempty"`
+	KeyRange *KeyRange `protobuf:"bytes,7,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	// type is the current type of the tablet.
-	Type TabletType `protobuf:"varint,8,opt,name=type,enum=topodata.TabletType" json:"type,omitempty"`
+	Type TabletType `protobuf:"varint,8,opt,name=type,proto3,enum=topodata.TabletType" json:"type,omitempty"`
 	// It this is set, it is used as the database name instead of the
 	// normal "vt_" + keyspace.
-	DbNameOverride string `protobuf:"bytes,9,opt,name=db_name_override,json=dbNameOverride" json:"db_name_override,omitempty"`
+	DbNameOverride string `protobuf:"bytes,9,opt,name=db_name_override,json=dbNameOverride,proto3" json:"db_name_override,omitempty"`
 	// tablet tags
-	Tags map[string]string `protobuf:"bytes,10,rep,name=tags" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Tags map[string]string `protobuf:"bytes,10,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// MySQL hostname.
-	MysqlHostname string `protobuf:"bytes,12,opt,name=mysql_hostname,json=mysqlHostname" json:"mysql_hostname,omitempty"`
+	MysqlHostname string `protobuf:"bytes,12,opt,name=mysql_hostname,json=mysqlHostname,proto3" json:"mysql_hostname,omitempty"`
 	// MySQL port. Use topoproto.MysqlPort and topoproto.SetMysqlPort
 	// to access this variable. The functions provide support
 	// for legacy behavior.
-	MysqlPort            int32    `protobuf:"varint,13,opt,name=mysql_port,json=mysqlPort" json:"mysql_port,omitempty"`
+	MysqlPort            int32    `protobuf:"varint,13,opt,name=mysql_port,json=mysqlPort,proto3" json:"mysql_port,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -364,27 +364,27 @@ type Shard struct {
 	// shard for reparenting operations (InitShardMaster,
 	// PlannedReparentShard,EmergencyReparentShard), to guarantee
 	// exclusive operation.
-	MasterAlias *TabletAlias `protobuf:"bytes,1,opt,name=master_alias,json=masterAlias" json:"master_alias,omitempty"`
+	MasterAlias *TabletAlias `protobuf:"bytes,1,opt,name=master_alias,json=masterAlias,proto3" json:"master_alias,omitempty"`
 	// key_range is the KeyRange for this shard. It can be unset if:
 	// - we are not using range-based sharding in this shard.
 	// - the shard covers the entire keyrange.
 	// This must match the shard name based on our other conventions, but
 	// helpful to have it decomposed here.
 	// Once set at creation time, it is never changed.
-	KeyRange *KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange" json:"key_range,omitempty"`
+	KeyRange *KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	// served_types has at most one entry per TabletType
 	// The keyspace lock is always taken when changing this.
-	ServedTypes []*Shard_ServedType `protobuf:"bytes,3,rep,name=served_types,json=servedTypes" json:"served_types,omitempty"`
+	ServedTypes []*Shard_ServedType `protobuf:"bytes,3,rep,name=served_types,json=servedTypes,proto3" json:"served_types,omitempty"`
 	// SourceShards is the list of shards we're replicating from,
 	// using filtered replication.
 	// The keyspace lock is always taken when changing this.
-	SourceShards []*Shard_SourceShard `protobuf:"bytes,4,rep,name=source_shards,json=sourceShards" json:"source_shards,omitempty"`
+	SourceShards []*Shard_SourceShard `protobuf:"bytes,4,rep,name=source_shards,json=sourceShards,proto3" json:"source_shards,omitempty"`
 	// Cells is the list of cells that contain tablets for this shard.
 	// No lock is necessary to update this field.
-	Cells []string `protobuf:"bytes,5,rep,name=cells" json:"cells,omitempty"`
+	Cells []string `protobuf:"bytes,5,rep,name=cells,proto3" json:"cells,omitempty"`
 	// tablet_controls has at most one entry per TabletType.
 	// The keyspace lock is always taken when changing this.
-	TabletControls       []*Shard_TabletControl `protobuf:"bytes,6,rep,name=tablet_controls,json=tabletControls" json:"tablet_controls,omitempty"`
+	TabletControls       []*Shard_TabletControl `protobuf:"bytes,6,rep,name=tablet_controls,json=tabletControls,proto3" json:"tablet_controls,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
 	XXX_unrecognized     []byte                 `json:"-"`
 	XXX_sizecache        int32                  `json:"-"`
@@ -458,8 +458,8 @@ func (m *Shard) GetTabletControls() []*Shard_TabletControl {
 
 // ServedType is an entry in the served_types
 type Shard_ServedType struct {
-	TabletType           TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
-	Cells                []string   `protobuf:"bytes,2,rep,name=cells" json:"cells,omitempty"`
+	TabletType           TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	Cells                []string   `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
 	XXX_unrecognized     []byte     `json:"-"`
 	XXX_sizecache        int32      `json:"-"`
@@ -508,15 +508,15 @@ func (m *Shard_ServedType) GetCells() []string {
 // of that shard will run filtered replication.
 type Shard_SourceShard struct {
 	// Uid is the unique ID for this SourceShard object.
-	Uid uint32 `protobuf:"varint,1,opt,name=uid" json:"uid,omitempty"`
+	Uid uint32 `protobuf:"varint,1,opt,name=uid,proto3" json:"uid,omitempty"`
 	// the source keyspace
-	Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// the source shard
-	Shard string `protobuf:"bytes,3,opt,name=shard" json:"shard,omitempty"`
+	Shard string `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
 	// the source shard keyrange
-	KeyRange *KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange" json:"key_range,omitempty"`
+	KeyRange *KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	// the source table list to replicate
-	Tables               []string `protobuf:"bytes,5,rep,name=tables" json:"tables,omitempty"`
+	Tables               []string `protobuf:"bytes,5,rep,name=tables,proto3" json:"tables,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -584,14 +584,14 @@ func (m *Shard_SourceShard) GetTables() []string {
 // TabletControl controls tablet's behavior
 type Shard_TabletControl struct {
 	// which tablet type is affected
-	TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
-	Cells      []string   `protobuf:"bytes,2,rep,name=cells" json:"cells,omitempty"`
+	TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	Cells      []string   `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
 	// what to do
-	DisableQueryService bool     `protobuf:"varint,3,opt,name=disable_query_service,json=disableQueryService" json:"disable_query_service,omitempty"`
-	BlacklistedTables   []string `protobuf:"bytes,4,rep,name=blacklisted_tables,json=blacklistedTables" json:"blacklisted_tables,omitempty"`
+	DisableQueryService bool     `protobuf:"varint,3,opt,name=disable_query_service,json=disableQueryService,proto3" json:"disable_query_service,omitempty"`
+	BlacklistedTables   []string `protobuf:"bytes,4,rep,name=blacklisted_tables,json=blacklistedTables,proto3" json:"blacklisted_tables,omitempty"`
 	// frozen is set if we've started failing over traffic for
 	// the master. If set, this record should not be removed.
-	Frozen               bool     `protobuf:"varint,5,opt,name=frozen" json:"frozen,omitempty"`
+	Frozen               bool     `protobuf:"varint,5,opt,name=frozen,proto3" json:"frozen,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -660,13 +660,13 @@ func (m *Shard_TabletControl) GetFrozen() bool {
 type Keyspace struct {
 	// name of the column used for sharding
 	// empty if the keyspace is not sharded
-	ShardingColumnName string `protobuf:"bytes,1,opt,name=sharding_column_name,json=shardingColumnName" json:"sharding_column_name,omitempty"`
+	ShardingColumnName string `protobuf:"bytes,1,opt,name=sharding_column_name,json=shardingColumnName,proto3" json:"sharding_column_name,omitempty"`
 	// type of the column used for sharding
 	// UNSET if the keyspace is not sharded
-	ShardingColumnType KeyspaceIdType `protobuf:"varint,2,opt,name=sharding_column_type,json=shardingColumnType,enum=topodata.KeyspaceIdType" json:"sharding_column_type,omitempty"`
+	ShardingColumnType KeyspaceIdType `protobuf:"varint,2,opt,name=sharding_column_type,json=shardingColumnType,proto3,enum=topodata.KeyspaceIdType" json:"sharding_column_type,omitempty"`
 	// ServedFrom will redirect the appropriate traffic to
 	// another keyspace.
-	ServedFroms          []*Keyspace_ServedFrom `protobuf:"bytes,4,rep,name=served_froms,json=servedFroms" json:"served_froms,omitempty"`
+	ServedFroms          []*Keyspace_ServedFrom `protobuf:"bytes,4,rep,name=served_froms,json=servedFroms,proto3" json:"served_froms,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
 	XXX_unrecognized     []byte                 `json:"-"`
 	XXX_sizecache        int32                  `json:"-"`
@@ -721,11 +721,11 @@ func (m *Keyspace) GetServedFroms() []*Keyspace_ServedFrom {
 // keyspace name that's serving it.
 type Keyspace_ServedFrom struct {
 	// the tablet type (key for the map)
-	TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// the cells to limit this to
-	Cells []string `protobuf:"bytes,2,rep,name=cells" json:"cells,omitempty"`
+	Cells []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
 	// the keyspace name that's serving it
-	Keyspace             string   `protobuf:"bytes,3,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace             string   `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -781,7 +781,7 @@ func (m *Keyspace_ServedFrom) GetKeyspace() string {
 type ShardReplication struct {
 	// Note there can be only one Node in this array
 	// for a given tablet.
-	Nodes                []*ShardReplication_Node `protobuf:"bytes,1,rep,name=nodes" json:"nodes,omitempty"`
+	Nodes                []*ShardReplication_Node `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
 	XXX_unrecognized     []byte                   `json:"-"`
 	XXX_sizecache        int32                    `json:"-"`
@@ -820,7 +820,7 @@ func (m *ShardReplication) GetNodes() []*ShardReplication_Node {
 
 // Node describes a tablet instance within the cell
 type ShardReplication_Node struct {
-	TabletAlias          *TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias" json:"tablet_alias,omitempty"`
+	TabletAlias          *TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -860,8 +860,8 @@ func (m *ShardReplication_Node) GetTabletAlias() *TabletAlias {
 // ShardReference is used as a pointer from a SrvKeyspace to a Shard
 type ShardReference struct {
 	// Copied from Shard.
-	Name                 string    `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	KeyRange             *KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange" json:"key_range,omitempty"`
+	Name                 string    `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	KeyRange             *KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
 	XXX_unrecognized     []byte    `json:"-"`
 	XXX_sizecache        int32     `json:"-"`
@@ -908,11 +908,11 @@ func (m *ShardReference) GetKeyRange() *KeyRange {
 // SrvKeyspace is a rollup node for the keyspace itself.
 type SrvKeyspace struct {
 	// The partitions this keyspace is serving, per tablet type.
-	Partitions []*SrvKeyspace_KeyspacePartition `protobuf:"bytes,1,rep,name=partitions" json:"partitions,omitempty"`
+	Partitions []*SrvKeyspace_KeyspacePartition `protobuf:"bytes,1,rep,name=partitions,proto3" json:"partitions,omitempty"`
 	// copied from Keyspace
-	ShardingColumnName   string                    `protobuf:"bytes,2,opt,name=sharding_column_name,json=shardingColumnName" json:"sharding_column_name,omitempty"`
-	ShardingColumnType   KeyspaceIdType            `protobuf:"varint,3,opt,name=sharding_column_type,json=shardingColumnType,enum=topodata.KeyspaceIdType" json:"sharding_column_type,omitempty"`
-	ServedFrom           []*SrvKeyspace_ServedFrom `protobuf:"bytes,4,rep,name=served_from,json=servedFrom" json:"served_from,omitempty"`
+	ShardingColumnName   string                    `protobuf:"bytes,2,opt,name=sharding_column_name,json=shardingColumnName,proto3" json:"sharding_column_name,omitempty"`
+	ShardingColumnType   KeyspaceIdType            `protobuf:"varint,3,opt,name=sharding_column_type,json=shardingColumnType,proto3,enum=topodata.KeyspaceIdType" json:"sharding_column_type,omitempty"`
+	ServedFrom           []*SrvKeyspace_ServedFrom `protobuf:"bytes,4,rep,name=served_from,json=servedFrom,proto3" json:"served_from,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
 	XXX_unrecognized     []byte                    `json:"-"`
 	XXX_sizecache        int32                     `json:"-"`
@@ -972,9 +972,9 @@ func (m *SrvKeyspace) GetServedFrom() []*SrvKeyspace_ServedFrom {
 
 type SrvKeyspace_KeyspacePartition struct {
 	// The type this partition applies to.
-	ServedType TabletType `protobuf:"varint,1,opt,name=served_type,json=servedType,enum=topodata.TabletType" json:"served_type,omitempty"`
+	ServedType TabletType `protobuf:"varint,1,opt,name=served_type,json=servedType,proto3,enum=topodata.TabletType" json:"served_type,omitempty"`
 	// List of non-overlapping continuous shards sorted by range.
-	ShardReferences      []*ShardReference `protobuf:"bytes,2,rep,name=shard_references,json=shardReferences" json:"shard_references,omitempty"`
+	ShardReferences      []*ShardReference `protobuf:"bytes,2,rep,name=shard_references,json=shardReferences,proto3" json:"shard_references,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -1022,9 +1022,9 @@ func (m *SrvKeyspace_KeyspacePartition) GetShardReferences() []*ShardReference {
 // keyspace name that's serving it.
 type SrvKeyspace_ServedFrom struct {
 	// the tablet type
-	TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// the keyspace name that's serving it
-	Keyspace             string   `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace             string   `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1076,13 +1076,13 @@ type CellInfo struct {
 	// The syntax of this field is topology implementation specific.
 	// For instance, for Zookeeper, it is a comma-separated list of
 	// server addresses.
-	ServerAddress string `protobuf:"bytes,1,opt,name=server_address,json=serverAddress" json:"server_address,omitempty"`
+	ServerAddress string `protobuf:"bytes,1,opt,name=server_address,json=serverAddress,proto3" json:"server_address,omitempty"`
 	// Root is the path to store data in. It is only used when talking
 	// to server_address.
-	Root string `protobuf:"bytes,2,opt,name=root" json:"root,omitempty"`
+	Root string `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty"`
 	// Region is a group this cell belongs to. Used by vtgate to route traffic to
 	// other cells (in same region) when there is no available tablet in the current cell.
-	Region               string   `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region               string   `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
diff --git a/go/vt/proto/vschema/vschema.pb.go b/go/vt/proto/vschema/vschema.pb.go
index da4101a3090..e6436628cda 100644
--- a/go/vt/proto/vschema/vschema.pb.go
+++ b/go/vt/proto/vschema/vschema.pb.go
@@ -22,9 +22,9 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // Keyspace is the vschema for a keyspace.
 type Keyspace struct {
 	// If sharded is false, vindexes and tables are ignored.
-	Sharded              bool               `protobuf:"varint,1,opt,name=sharded" json:"sharded,omitempty"`
-	Vindexes             map[string]*Vindex `protobuf:"bytes,2,rep,name=vindexes" json:"vindexes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Tables               map[string]*Table  `protobuf:"bytes,3,rep,name=tables" json:"tables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Sharded              bool               `protobuf:"varint,1,opt,name=sharded,proto3" json:"sharded,omitempty"`
+	Vindexes             map[string]*Vindex `protobuf:"bytes,2,rep,name=vindexes,proto3" json:"vindexes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Tables               map[string]*Table  `protobuf:"bytes,3,rep,name=tables,proto3" json:"tables,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:"-"`
@@ -79,17 +79,17 @@ func (m *Keyspace) GetTables() map[string]*Table {
 type Vindex struct {
 	// The type must match one of the predefined
 	// (or plugged in) vindex names.
-	Type string `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"`
+	Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
 	// params is a map of attribute value pairs
 	// that must be defined as required by the
 	// vindex constructors. The values can only
 	// be strings.
-	Params map[string]string `protobuf:"bytes,2,rep,name=params" json:"params,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Params map[string]string `protobuf:"bytes,2,rep,name=params,proto3" json:"params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// A lookup vindex can have an owner table defined.
 	// If so, rows in the lookup table are created or
 	// deleted in sync with corresponding rows in the
 	// owner table.
-	Owner                string   `protobuf:"bytes,3,opt,name=owner" json:"owner,omitempty"`
+	Owner                string   `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -144,23 +144,23 @@ func (m *Vindex) GetOwner() string {
 type Table struct {
 	// If the table is a sequence, type must be
 	// "sequence". Otherwise, it should be empty.
-	Type string `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"`
+	Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
 	// column_vindexes associates columns to vindexes.
-	ColumnVindexes []*ColumnVindex `protobuf:"bytes,2,rep,name=column_vindexes,json=columnVindexes" json:"column_vindexes,omitempty"`
+	ColumnVindexes []*ColumnVindex `protobuf:"bytes,2,rep,name=column_vindexes,json=columnVindexes,proto3" json:"column_vindexes,omitempty"`
 	// auto_increment is specified if a column needs
 	// to be associated with a sequence.
-	AutoIncrement *AutoIncrement `protobuf:"bytes,3,opt,name=auto_increment,json=autoIncrement" json:"auto_increment,omitempty"`
+	AutoIncrement *AutoIncrement `protobuf:"bytes,3,opt,name=auto_increment,json=autoIncrement,proto3" json:"auto_increment,omitempty"`
 	// columns lists the columns for the table.
-	Columns []*Column `protobuf:"bytes,4,rep,name=columns" json:"columns,omitempty"`
+	Columns []*Column `protobuf:"bytes,4,rep,name=columns,proto3" json:"columns,omitempty"`
 	// pinned pins an unsharded table to a specific
 	// shard, as dictated by the keyspace id.
 	// The keyspace id is represened in hex form
 	// like in keyranges.
-	Pinned string `protobuf:"bytes,5,opt,name=pinned" json:"pinned,omitempty"`
+	Pinned string `protobuf:"bytes,5,opt,name=pinned,proto3" json:"pinned,omitempty"`
 	// column_list_authoritative is set to true if columns is
 	// an authoritative list for the table. This allows
 	// us to expand 'select *' expressions.
-	ColumnListAuthoritative bool     `protobuf:"varint,6,opt,name=column_list_authoritative,json=columnListAuthoritative" json:"column_list_authoritative,omitempty"`
+	ColumnListAuthoritative bool     `protobuf:"varint,6,opt,name=column_list_authoritative,json=columnListAuthoritative,proto3" json:"column_list_authoritative,omitempty"`
 	XXX_NoUnkeyedLiteral    struct{} `json:"-"`
 	XXX_unrecognized        []byte   `json:"-"`
 	XXX_sizecache           int32    `json:"-"`
@@ -235,11 +235,11 @@ func (m *Table) GetColumnListAuthoritative() bool {
 // ColumnVindex is used to associate a column to a vindex.
 type ColumnVindex struct {
 	// Legacy implemenation, moving forward all vindexes should define a list of columns.
-	Column string `protobuf:"bytes,1,opt,name=column" json:"column,omitempty"`
+	Column string `protobuf:"bytes,1,opt,name=column,proto3" json:"column,omitempty"`
 	// The name must match a vindex defined in Keyspace.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// List of columns that define this Vindex
-	Columns              []string `protobuf:"bytes,3,rep,name=columns" json:"columns,omitempty"`
+	Columns              []string `protobuf:"bytes,3,rep,name=columns,proto3" json:"columns,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -292,9 +292,9 @@ func (m *ColumnVindex) GetColumns() []string {
 
 // Autoincrement is used to designate a column as auto-inc.
 type AutoIncrement struct {
-	Column string `protobuf:"bytes,1,opt,name=column" json:"column,omitempty"`
+	Column string `protobuf:"bytes,1,opt,name=column,proto3" json:"column,omitempty"`
 	// The sequence must match a table of type SEQUENCE.
-	Sequence             string   `protobuf:"bytes,2,opt,name=sequence" json:"sequence,omitempty"`
+	Sequence             string   `protobuf:"bytes,2,opt,name=sequence,proto3" json:"sequence,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -340,8 +340,8 @@ func (m *AutoIncrement) GetSequence() string {
 
 // Column describes a column.
 type Column struct {
-	Name                 string     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Type                 query.Type `protobuf:"varint,2,opt,name=type,enum=query.Type" json:"type,omitempty"`
+	Name                 string     `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Type                 query.Type `protobuf:"varint,2,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
 	XXX_unrecognized     []byte     `json:"-"`
 	XXX_sizecache        int32      `json:"-"`
@@ -388,7 +388,7 @@ func (m *Column) GetType() query.Type {
 // SrvVSchema is the roll-up of all the Keyspace schema for a cell.
 type SrvVSchema struct {
 	// keyspaces is a map of keyspace name -> Keyspace object.
-	Keyspaces            map[string]*Keyspace `protobuf:"bytes,1,rep,name=keyspaces" json:"keyspaces,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Keyspaces            map[string]*Keyspace `protobuf:"bytes,1,rep,name=keyspaces,proto3" json:"keyspaces,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:"-"`
diff --git a/go/vt/proto/vtctldata/vtctldata.pb.go b/go/vt/proto/vtctldata/vtctldata.pb.go
index 080555a9b2c..849b81f15ec 100644
--- a/go/vt/proto/vtctldata/vtctldata.pb.go
+++ b/go/vt/proto/vtctldata/vtctldata.pb.go
@@ -22,8 +22,8 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // ExecuteVtctlCommandRequest is the payload for ExecuteVtctlCommand.
 // timeouts are in nanoseconds.
 type ExecuteVtctlCommandRequest struct {
-	Args                 []string `protobuf:"bytes,1,rep,name=args" json:"args,omitempty"`
-	ActionTimeout        int64    `protobuf:"varint,2,opt,name=action_timeout,json=actionTimeout" json:"action_timeout,omitempty"`
+	Args                 []string `protobuf:"bytes,1,rep,name=args,proto3" json:"args,omitempty"`
+	ActionTimeout        int64    `protobuf:"varint,2,opt,name=action_timeout,json=actionTimeout,proto3" json:"action_timeout,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -69,7 +69,7 @@ func (m *ExecuteVtctlCommandRequest) GetActionTimeout() int64 {
 
 // ExecuteVtctlCommandResponse is streamed back by ExecuteVtctlCommand.
 type ExecuteVtctlCommandResponse struct {
-	Event                *logutil.Event `protobuf:"bytes,1,opt,name=event" json:"event,omitempty"`
+	Event                *logutil.Event `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
diff --git a/go/vt/proto/vtctlservice/vtctlservice.pb.go b/go/vt/proto/vtctlservice/vtctlservice.pb.go
index d1738b8275b..4214d5d15af 100644
--- a/go/vt/proto/vtctlservice/vtctlservice.pb.go
+++ b/go/vt/proto/vtctlservice/vtctlservice.pb.go
@@ -32,8 +32,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Vtctl service
-
+// VtctlClient is the client API for Vtctl service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type VtctlClient interface {
 	ExecuteVtctlCommand(ctx context.Context, in *vtctldata.ExecuteVtctlCommandRequest, opts ...grpc.CallOption) (Vtctl_ExecuteVtctlCommandClient, error)
 }
@@ -47,7 +48,7 @@ func NewVtctlClient(cc *grpc.ClientConn) VtctlClient {
 }
 
 func (c *vtctlClient) ExecuteVtctlCommand(ctx context.Context, in *vtctldata.ExecuteVtctlCommandRequest, opts ...grpc.CallOption) (Vtctl_ExecuteVtctlCommandClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Vtctl_serviceDesc.Streams[0], c.cc, "/vtctlservice.Vtctl/ExecuteVtctlCommand", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Vtctl_serviceDesc.Streams[0], "/vtctlservice.Vtctl/ExecuteVtctlCommand", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -78,8 +79,7 @@ func (x *vtctlExecuteVtctlCommandClient) Recv() (*vtctldata.ExecuteVtctlCommandR
 	return m, nil
 }
 
-// Server API for Vtctl service
-
+// VtctlServer is the server API for Vtctl service.
 type VtctlServer interface {
 	ExecuteVtctlCommand(*vtctldata.ExecuteVtctlCommandRequest, Vtctl_ExecuteVtctlCommandServer) error
 }
diff --git a/go/vt/proto/vtgate/vtgate.pb.go b/go/vt/proto/vtgate/vtgate.pb.go
index 8c76c8fe00e..51e445dc618 100644
--- a/go/vt/proto/vtgate/vtgate.pb.go
+++ b/go/vt/proto/vtgate/vtgate.pb.go
@@ -68,27 +68,27 @@ func (TransactionMode) EnumDescriptor() ([]byte, []int) {
 // an optional parameter for the V2 APIs.
 type Session struct {
 	// in_transaction is set to true if the session is in a transaction.
-	InTransaction bool `protobuf:"varint,1,opt,name=in_transaction,json=inTransaction" json:"in_transaction,omitempty"`
+	InTransaction bool `protobuf:"varint,1,opt,name=in_transaction,json=inTransaction,proto3" json:"in_transaction,omitempty"`
 	// shard_sessions keep track of per-shard transaction info.
-	ShardSessions []*Session_ShardSession `protobuf:"bytes,2,rep,name=shard_sessions,json=shardSessions" json:"shard_sessions,omitempty"`
+	ShardSessions []*Session_ShardSession `protobuf:"bytes,2,rep,name=shard_sessions,json=shardSessions,proto3" json:"shard_sessions,omitempty"`
 	// single_db is deprecated. Use transaction_mode instead.
 	// The value specifies if the transaction should be restricted
 	// to a single shard.
 	// TODO(sougou): remove in 3.1
-	SingleDb bool `protobuf:"varint,3,opt,name=single_db,json=singleDb" json:"single_db,omitempty"`
+	SingleDb bool `protobuf:"varint,3,opt,name=single_db,json=singleDb,proto3" json:"single_db,omitempty"`
 	// autocommit specifies if the session is in autocommit mode.
 	// This is used only for V3.
-	Autocommit bool `protobuf:"varint,4,opt,name=autocommit" json:"autocommit,omitempty"`
+	Autocommit bool `protobuf:"varint,4,opt,name=autocommit,proto3" json:"autocommit,omitempty"`
 	// target_string is the target expressed as a string. Valid
 	// names are: keyspace:shard@target, keyspace@target or @target.
 	// This is used only for V3.
-	TargetString string `protobuf:"bytes,5,opt,name=target_string,json=targetString" json:"target_string,omitempty"`
+	TargetString string `protobuf:"bytes,5,opt,name=target_string,json=targetString,proto3" json:"target_string,omitempty"`
 	// options is used only for V3.
-	Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"`
+	Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
 	// transaction_mode specifies the current transaction mode.
-	TransactionMode TransactionMode `protobuf:"varint,7,opt,name=transaction_mode,json=transactionMode,enum=vtgate.TransactionMode" json:"transaction_mode,omitempty"`
+	TransactionMode TransactionMode `protobuf:"varint,7,opt,name=transaction_mode,json=transactionMode,proto3,enum=vtgate.TransactionMode" json:"transaction_mode,omitempty"`
 	// warnings contains non-fatal warnings from the previous query
-	Warnings             []*query.QueryWarning `protobuf:"bytes,8,rep,name=warnings" json:"warnings,omitempty"`
+	Warnings             []*query.QueryWarning `protobuf:"bytes,8,rep,name=warnings,proto3" json:"warnings,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -175,8 +175,8 @@ func (m *Session) GetWarnings() []*query.QueryWarning {
 }
 
 type Session_ShardSession struct {
-	Target               *query.Target `protobuf:"bytes,1,opt,name=target" json:"target,omitempty"`
-	TransactionId        int64         `protobuf:"varint,2,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"`
+	Target               *query.Target `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId        int64         `protobuf:"varint,2,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
 	XXX_unrecognized     []byte        `json:"-"`
 	XXX_sizecache        int32         `json:"-"`
@@ -224,17 +224,17 @@ func (m *Session_ShardSession) GetTransactionId() int64 {
 type ExecuteRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the session state.
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
 	// These values are deprecated. Use session instead.
 	// TODO(sougou): remove in 3.1
-	TabletType           topodata.TabletType   `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
-	NotInTransaction     bool                  `protobuf:"varint,5,opt,name=not_in_transaction,json=notInTransaction" json:"not_in_transaction,omitempty"`
-	KeyspaceShard        string                `protobuf:"bytes,6,opt,name=keyspace_shard,json=keyspaceShard" json:"keyspace_shard,omitempty"`
-	Options              *query.ExecuteOptions `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"`
+	TabletType           topodata.TabletType   `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	NotInTransaction     bool                  `protobuf:"varint,5,opt,name=not_in_transaction,json=notInTransaction,proto3" json:"not_in_transaction,omitempty"`
+	KeyspaceShard        string                `protobuf:"bytes,6,opt,name=keyspace_shard,json=keyspaceShard,proto3" json:"keyspace_shard,omitempty"`
+	Options              *query.ExecuteOptions `protobuf:"bytes,7,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -318,11 +318,11 @@ type ExecuteResponse struct {
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
-	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// session is the updated session information.
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// result contains the query result, only set if error is unset.
-	Result               *query.QueryResult `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -377,22 +377,22 @@ func (m *ExecuteResponse) GetResult() *query.QueryResult {
 type ExecuteShardsRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the current transaction data. It is returned by Begin.
 	// Do not fill it in if outside of a transaction.
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,4,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,4,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// shards to target the query to. A DML can only target one shard.
-	Shards []string `protobuf:"bytes,5,rep,name=shards" json:"shards,omitempty"`
+	Shards []string `protobuf:"bytes,5,rep,name=shards,proto3" json:"shards,omitempty"`
 	// tablet_type is the type of tablets that this query is targeted to.
-	TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// not_in_transaction is deprecated.
-	NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction" json:"not_in_transaction,omitempty"`
+	NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction,proto3" json:"not_in_transaction,omitempty"`
 	// options
-	Options              *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
+	Options              *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -483,11 +483,11 @@ type ExecuteShardsResponse struct {
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
-	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// session is the updated session information (only returned inside a transaction).
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// result contains the query result, only set if error is unset.
-	Result               *query.QueryResult `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -542,23 +542,23 @@ func (m *ExecuteShardsResponse) GetResult() *query.QueryResult {
 type ExecuteKeyspaceIdsRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the current transaction data. It is returned by Begin.
 	// Do not fill it in if outside of a transaction.
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,4,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,4,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// keyspace_ids contains the list of keyspace_ids affected by this query.
 	// Will be used to find the shards to send the query to.
 	KeyspaceIds [][]byte `protobuf:"bytes,5,rep,name=keyspace_ids,json=keyspaceIds,proto3" json:"keyspace_ids,omitempty"`
 	// tablet_type is the type of tablets that this query is targeted to.
-	TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// not_in_transaction is deprecated.
-	NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction" json:"not_in_transaction,omitempty"`
+	NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction,proto3" json:"not_in_transaction,omitempty"`
 	// options
-	Options              *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
+	Options              *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -649,11 +649,11 @@ type ExecuteKeyspaceIdsResponse struct {
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
-	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// session is the updated session information (only returned inside a transaction).
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// result contains the query result, only set if error is unset.
-	Result               *query.QueryResult `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -708,23 +708,23 @@ func (m *ExecuteKeyspaceIdsResponse) GetResult() *query.QueryResult {
 type ExecuteKeyRangesRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the current transaction data. It is returned by Begin.
 	// Do not fill it in if outside of a transaction.
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
 	// keyspace to target the query to
-	Keyspace string `protobuf:"bytes,4,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,4,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// key_ranges contains the list of key ranges affected by this query.
 	// Will be used to find the shards to send the query to.
-	KeyRanges []*topodata.KeyRange `protobuf:"bytes,5,rep,name=key_ranges,json=keyRanges" json:"key_ranges,omitempty"`
+	KeyRanges []*topodata.KeyRange `protobuf:"bytes,5,rep,name=key_ranges,json=keyRanges,proto3" json:"key_ranges,omitempty"`
 	// tablet_type is the type of tablets that this query is targeted to.
-	TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// not_in_transaction is deprecated.
-	NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction" json:"not_in_transaction,omitempty"`
+	NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction,proto3" json:"not_in_transaction,omitempty"`
 	// options
-	Options              *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
+	Options              *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -815,11 +815,11 @@ type ExecuteKeyRangesResponse struct {
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
-	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// session is the updated session information (only returned inside a transaction).
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// result contains the query result, only set if error is unset.
-	Result               *query.QueryResult `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -874,25 +874,25 @@ func (m *ExecuteKeyRangesResponse) GetResult() *query.QueryResult {
 type ExecuteEntityIdsRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the current transaction data. It is returned by Begin.
 	// Do not fill it in if outside of a transaction.
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,4,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,4,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// entity_column_name is the column name to use.
-	EntityColumnName string `protobuf:"bytes,5,opt,name=entity_column_name,json=entityColumnName" json:"entity_column_name,omitempty"`
+	EntityColumnName string `protobuf:"bytes,5,opt,name=entity_column_name,json=entityColumnName,proto3" json:"entity_column_name,omitempty"`
 	// entity_keyspace_ids are pairs of entity_column_name values
 	// associated with its corresponding keyspace_id.
-	EntityKeyspaceIds []*ExecuteEntityIdsRequest_EntityId `protobuf:"bytes,6,rep,name=entity_keyspace_ids,json=entityKeyspaceIds" json:"entity_keyspace_ids,omitempty"`
+	EntityKeyspaceIds []*ExecuteEntityIdsRequest_EntityId `protobuf:"bytes,6,rep,name=entity_keyspace_ids,json=entityKeyspaceIds,proto3" json:"entity_keyspace_ids,omitempty"`
 	// tablet_type is the type of tablets that this query is targeted to.
-	TabletType topodata.TabletType `protobuf:"varint,7,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,7,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// not_in_transaction is deprecated.
-	NotInTransaction bool `protobuf:"varint,8,opt,name=not_in_transaction,json=notInTransaction" json:"not_in_transaction,omitempty"`
+	NotInTransaction bool `protobuf:"varint,8,opt,name=not_in_transaction,json=notInTransaction,proto3" json:"not_in_transaction,omitempty"`
 	// options
-	Options              *query.ExecuteOptions `protobuf:"bytes,9,opt,name=options" json:"options,omitempty"`
+	Options              *query.ExecuteOptions `protobuf:"bytes,9,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -987,7 +987,7 @@ func (m *ExecuteEntityIdsRequest) GetOptions() *query.ExecuteOptions {
 
 type ExecuteEntityIdsRequest_EntityId struct {
 	// type is the type of the entity's value. Can be NULL_TYPE.
-	Type query.Type `protobuf:"varint,1,opt,name=type,enum=query.Type" json:"type,omitempty"`
+	Type query.Type `protobuf:"varint,1,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
 	// value is the value for the entity. Not set if type is NULL_TYPE.
 	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	// keyspace_id is the associated keyspace_id for the entity.
@@ -1047,11 +1047,11 @@ type ExecuteEntityIdsResponse struct {
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
-	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// session is the updated session information (only returned inside a transaction).
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// result contains the query result, only set if error is unset.
-	Result               *query.QueryResult `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -1106,17 +1106,17 @@ func (m *ExecuteEntityIdsResponse) GetResult() *query.QueryResult {
 type ExecuteBatchRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the session state.
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// queries is a list of query and bind variables to execute.
-	Queries []*query.BoundQuery `protobuf:"bytes,3,rep,name=queries" json:"queries,omitempty"`
+	Queries []*query.BoundQuery `protobuf:"bytes,3,rep,name=queries,proto3" json:"queries,omitempty"`
 	// These values are deprecated. Use session instead.
 	// TODO(sougou): remove in 3.1
-	TabletType           topodata.TabletType   `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
-	AsTransaction        bool                  `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction" json:"as_transaction,omitempty"`
-	KeyspaceShard        string                `protobuf:"bytes,6,opt,name=keyspace_shard,json=keyspaceShard" json:"keyspace_shard,omitempty"`
-	Options              *query.ExecuteOptions `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"`
+	TabletType           topodata.TabletType   `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	AsTransaction        bool                  `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction,proto3" json:"as_transaction,omitempty"`
+	KeyspaceShard        string                `protobuf:"bytes,6,opt,name=keyspace_shard,json=keyspaceShard,proto3" json:"keyspace_shard,omitempty"`
+	Options              *query.ExecuteOptions `protobuf:"bytes,7,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -1200,11 +1200,11 @@ type ExecuteBatchResponse struct {
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
-	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// session is the updated session information.
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// results contains the query results, only set if application level error is unset.
-	Results              []*query.ResultWithError `protobuf:"bytes,3,rep,name=results" json:"results,omitempty"`
+	Results              []*query.ResultWithError `protobuf:"bytes,3,rep,name=results,proto3" json:"results,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
 	XXX_unrecognized     []byte                   `json:"-"`
 	XXX_sizecache        int32                    `json:"-"`
@@ -1260,11 +1260,11 @@ func (m *ExecuteBatchResponse) GetResults() []*query.ResultWithError {
 // ExecuteBatchShardsRequest.
 type BoundShardQuery struct {
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// shards to target the query to. A DML can only target one shard.
-	Shards               []string `protobuf:"bytes,3,rep,name=shards" json:"shards,omitempty"`
+	Shards               []string `protobuf:"bytes,3,rep,name=shards,proto3" json:"shards,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1319,20 +1319,20 @@ func (m *BoundShardQuery) GetShards() []string {
 type ExecuteBatchShardsRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the current transaction data. It is returned by Begin.
 	// Do not fill it in if outside of a transaction.
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// queries carries all the queries to execute.
-	Queries []*BoundShardQuery `protobuf:"bytes,3,rep,name=queries" json:"queries,omitempty"`
+	Queries []*BoundShardQuery `protobuf:"bytes,3,rep,name=queries,proto3" json:"queries,omitempty"`
 	// tablet_type is the type of tablets that this query is targeted to.
-	TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// as_transaction will execute the queries in this batch in a single transaction per shard, created for this purpose.
 	// (this can be seen as adding a 'begin' before and 'commit' after the queries).
 	// Only makes sense if tablet_type is master. If set, the Session is ignored.
-	AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction" json:"as_transaction,omitempty"`
+	AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction,proto3" json:"as_transaction,omitempty"`
 	// options
-	Options              *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"`
+	Options              *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -1409,11 +1409,11 @@ type ExecuteBatchShardsResponse struct {
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
-	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// session is the updated session information (only returned inside a transaction).
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// result contains the query result, only set if error is unset.
-	Results              []*query.QueryResult `protobuf:"bytes,3,rep,name=results" json:"results,omitempty"`
+	Results              []*query.QueryResult `protobuf:"bytes,3,rep,name=results,proto3" json:"results,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
 	XXX_unrecognized     []byte               `json:"-"`
 	XXX_sizecache        int32                `json:"-"`
@@ -1469,9 +1469,9 @@ func (m *ExecuteBatchShardsResponse) GetResults() []*query.QueryResult {
 // ExecuteBatchKeyspaceIdsRequest.
 type BoundKeyspaceIdQuery struct {
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// keyspace_ids contains the list of keyspace_ids affected by this query.
 	// Will be used to find the shards to send the query to.
 	KeyspaceIds          [][]byte `protobuf:"bytes,3,rep,name=keyspace_ids,json=keyspaceIds,proto3" json:"keyspace_ids,omitempty"`
@@ -1529,19 +1529,19 @@ func (m *BoundKeyspaceIdQuery) GetKeyspaceIds() [][]byte {
 type ExecuteBatchKeyspaceIdsRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the current transaction data. It is returned by Begin.
 	// Do not fill it in if outside of a transaction.
-	Session *Session                `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
-	Queries []*BoundKeyspaceIdQuery `protobuf:"bytes,3,rep,name=queries" json:"queries,omitempty"`
+	Session *Session                `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
+	Queries []*BoundKeyspaceIdQuery `protobuf:"bytes,3,rep,name=queries,proto3" json:"queries,omitempty"`
 	// tablet_type is the type of tablets that this query is targeted to.
-	TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// as_transaction will execute the queries in this batch in a single transaction per shard, created for this purpose.
 	// (this can be seen as adding a 'begin' before and 'commit' after the queries).
 	// Only makes sense if tablet_type is master. If set, the Session is ignored.
-	AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction" json:"as_transaction,omitempty"`
+	AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction,proto3" json:"as_transaction,omitempty"`
 	// options
-	Options              *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"`
+	Options              *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -1618,11 +1618,11 @@ type ExecuteBatchKeyspaceIdsResponse struct {
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
-	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// session is the updated session information (only returned inside a transaction).
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// result contains the query result, only set if error is unset.
-	Results              []*query.QueryResult `protobuf:"bytes,3,rep,name=results" json:"results,omitempty"`
+	Results              []*query.QueryResult `protobuf:"bytes,3,rep,name=results,proto3" json:"results,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
 	XXX_unrecognized     []byte               `json:"-"`
 	XXX_sizecache        int32                `json:"-"`
@@ -1677,16 +1677,16 @@ func (m *ExecuteBatchKeyspaceIdsResponse) GetResults() []*query.QueryResult {
 type StreamExecuteRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
 	// These values are deprecated. Use session instead.
 	// TODO(sougou): remove in 3.1
-	TabletType    topodata.TabletType   `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
-	KeyspaceShard string                `protobuf:"bytes,4,opt,name=keyspace_shard,json=keyspaceShard" json:"keyspace_shard,omitempty"`
-	Options       *query.ExecuteOptions `protobuf:"bytes,5,opt,name=options" json:"options,omitempty"`
+	TabletType    topodata.TabletType   `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	KeyspaceShard string                `protobuf:"bytes,4,opt,name=keyspace_shard,json=keyspaceShard,proto3" json:"keyspace_shard,omitempty"`
+	Options       *query.ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
 	// session carries the session state.
-	Session              *Session `protobuf:"bytes,6,opt,name=session" json:"session,omitempty"`
+	Session              *Session `protobuf:"bytes,6,opt,name=session,proto3" json:"session,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1765,7 +1765,7 @@ type StreamExecuteResponse struct {
 	// result contains the result data.
 	// The first value contains only Fields information.
 	// The next values contain the actual rows, a few values per result.
-	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -1806,17 +1806,17 @@ func (m *StreamExecuteResponse) GetResult() *query.QueryResult {
 type StreamExecuteShardsRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,3,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// shards to target the query to.
-	Shards []string `protobuf:"bytes,4,rep,name=shards" json:"shards,omitempty"`
+	Shards []string `protobuf:"bytes,4,rep,name=shards,proto3" json:"shards,omitempty"`
 	// tablet_type is the type of tablets that this query is targeted to.
-	TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// options
-	Options              *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"`
+	Options              *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -1893,7 +1893,7 @@ type StreamExecuteShardsResponse struct {
 	// result contains the result data.
 	// The first value contains only Fields information.
 	// The next values contain the actual rows, a few values per result.
-	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -1934,18 +1934,18 @@ func (m *StreamExecuteShardsResponse) GetResult() *query.QueryResult {
 type StreamExecuteKeyspaceIdsRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,3,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// keyspace_ids contains the list of keyspace_ids affected by this query.
 	// Will be used to find the shards to send the query to.
 	KeyspaceIds [][]byte `protobuf:"bytes,4,rep,name=keyspace_ids,json=keyspaceIds,proto3" json:"keyspace_ids,omitempty"`
 	// tablet_type is the type of tablets that this query is targeted to.
-	TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// options
-	Options              *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"`
+	Options              *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -2022,7 +2022,7 @@ type StreamExecuteKeyspaceIdsResponse struct {
 	// result contains the result data.
 	// The first value contains only Fields information.
 	// The next values contain the actual rows, a few values per result.
-	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -2063,18 +2063,18 @@ func (m *StreamExecuteKeyspaceIdsResponse) GetResult() *query.QueryResult {
 type StreamExecuteKeyRangesRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,3,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// key_ranges contains the list of key ranges affected by this query.
 	// Will be used to find the shards to send the query to.
-	KeyRanges []*topodata.KeyRange `protobuf:"bytes,4,rep,name=key_ranges,json=keyRanges" json:"key_ranges,omitempty"`
+	KeyRanges []*topodata.KeyRange `protobuf:"bytes,4,rep,name=key_ranges,json=keyRanges,proto3" json:"key_ranges,omitempty"`
 	// tablet_type is the type of tablets that this query is targeted to.
-	TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// options
-	Options              *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"`
+	Options              *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -2151,7 +2151,7 @@ type StreamExecuteKeyRangesResponse struct {
 	// result contains the result data.
 	// The first value contains only Fields information.
 	// The next values contain the actual rows, a few values per result.
-	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result               *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -2192,12 +2192,12 @@ func (m *StreamExecuteKeyRangesResponse) GetResult() *query.QueryResult {
 type BeginRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// single_db is deprecated. Use transaction_mode instead.
 	// The value specifies if the transaction should be restricted
 	// to a single database.
 	// TODO(sougou): remove in 3.1
-	SingleDb             bool     `protobuf:"varint,2,opt,name=single_db,json=singleDb" json:"single_db,omitempty"`
+	SingleDb             bool     `protobuf:"varint,2,opt,name=single_db,json=singleDb,proto3" json:"single_db,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2244,7 +2244,7 @@ func (m *BeginRequest) GetSingleDb() bool {
 // BeginResponse is the returned value from Begin.
 type BeginResponse struct {
 	// session is the initial session information to use for subsequent queries.
-	Session              *Session `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"`
+	Session              *Session `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2285,14 +2285,14 @@ func (m *BeginResponse) GetSession() *Session {
 type CommitRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the current transaction data to commit.
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// atomic is deprecated. Use transaction_mode instead.
 	// The value specifies if the commit should go through the
 	// 2PC workflow to ensure atomicity.
 	// TODO(sougou): remove in 3.1
-	Atomic               bool     `protobuf:"varint,3,opt,name=atomic" json:"atomic,omitempty"`
+	Atomic               bool     `protobuf:"varint,3,opt,name=atomic,proto3" json:"atomic,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2378,9 +2378,9 @@ var xxx_messageInfo_CommitResponse proto.InternalMessageInfo
 type RollbackRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the current transaction data to rollback.
-	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:"-"`
@@ -2459,9 +2459,9 @@ var xxx_messageInfo_RollbackResponse proto.InternalMessageInfo
 type ResolveTransactionRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// dtid is the dtid of the transaction to be resolved.
-	Dtid                 string   `protobuf:"bytes,2,opt,name=dtid" json:"dtid,omitempty"`
+	Dtid                 string   `protobuf:"bytes,2,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2509,15 +2509,15 @@ func (m *ResolveTransactionRequest) GetDtid() string {
 type MessageStreamRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// shard to target the query to, for unsharded keyspaces.
-	Shard string `protobuf:"bytes,3,opt,name=shard" json:"shard,omitempty"`
+	Shard string `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
 	// KeyRange to target the query to, for sharded keyspaces.
-	KeyRange *topodata.KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange" json:"key_range,omitempty"`
+	KeyRange *topodata.KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	// name is the message table name.
-	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:"-"`
@@ -2586,13 +2586,13 @@ func (m *MessageStreamRequest) GetName() string {
 type MessageAckRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// keyspace to target the message to.
-	Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// name is the message table name.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// ids is the list of ids to ack.
-	Ids                  []*query.Value `protobuf:"bytes,4,rep,name=ids" json:"ids,omitempty"`
+	Ids                  []*query.Value `protobuf:"bytes,4,rep,name=ids,proto3" json:"ids,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
@@ -2654,7 +2654,7 @@ func (m *MessageAckRequest) GetIds() []*query.Value {
 // The kesypace_id represents the routing info for id.
 type IdKeyspaceId struct {
 	// id represents the message id.
-	Id *query.Value `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id *query.Value `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// keyspace_id is the associated keyspace_id for the id.
 	KeyspaceId           []byte   `protobuf:"bytes,2,opt,name=keyspace_id,json=keyspaceId,proto3" json:"keyspace_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -2704,12 +2704,12 @@ func (m *IdKeyspaceId) GetKeyspaceId() []byte {
 type MessageAckKeyspaceIdsRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// Optional keyspace for message table.
-	Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// name is the message table name.
-	Name                 string          `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
-	IdKeyspaceIds        []*IdKeyspaceId `protobuf:"bytes,4,rep,name=id_keyspace_ids,json=idKeyspaceIds" json:"id_keyspace_ids,omitempty"`
+	Name                 string          `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	IdKeyspaceIds        []*IdKeyspaceId `protobuf:"bytes,4,rep,name=id_keyspace_ids,json=idKeyspaceIds,proto3" json:"id_keyspace_ids,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -2818,9 +2818,9 @@ var xxx_messageInfo_ResolveTransactionResponse proto.InternalMessageInfo
 type SplitQueryRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// The query and bind variables to produce splits for.
 	// The given query must be a simple query of the form
 	// SELECT <cols> FROM <table> WHERE <filter>.
@@ -2828,7 +2828,7 @@ type SplitQueryRequest struct {
 	// JOIN, GROUP BY, ORDER BY, LIMIT, DISTINCT.
 	// Furthermore, <table> must be a single “concrete” table.
 	// It cannot be a view.
-	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
 	// Each generated query-part will be restricted to rows whose values
 	// in the columns listed in this field are in a particular range.
 	// The list of columns named here must be a prefix of the list of
@@ -2837,7 +2837,7 @@ type SplitQueryRequest struct {
 	// (in order) is sufficient and this is the default if this field is omitted.
 	// See the comment on the 'algorithm' field for more restrictions and
 	// information.
-	SplitColumn []string `protobuf:"bytes,4,rep,name=split_column,json=splitColumn" json:"split_column,omitempty"`
+	SplitColumn []string `protobuf:"bytes,4,rep,name=split_column,json=splitColumn,proto3" json:"split_column,omitempty"`
 	// You can specify either an estimate of the number of query-parts to
 	// generate or an estimate of the number of rows each query-part should
 	// return.
@@ -2850,8 +2850,8 @@ type SplitQueryRequest struct {
 	// Note that if "split_count" is given it is regarded as an estimate.
 	// The number of query-parts returned may differ slightly (in particular,
 	// if it's not a whole multiple of the number of vitess shards).
-	SplitCount          int64 `protobuf:"varint,5,opt,name=split_count,json=splitCount" json:"split_count,omitempty"`
-	NumRowsPerQueryPart int64 `protobuf:"varint,6,opt,name=num_rows_per_query_part,json=numRowsPerQueryPart" json:"num_rows_per_query_part,omitempty"`
+	SplitCount          int64 `protobuf:"varint,5,opt,name=split_count,json=splitCount,proto3" json:"split_count,omitempty"`
+	NumRowsPerQueryPart int64 `protobuf:"varint,6,opt,name=num_rows_per_query_part,json=numRowsPerQueryPart,proto3" json:"num_rows_per_query_part,omitempty"`
 	// The algorithm to use to split the query. The split algorithm is performed
 	// on each database shard in parallel. The lists of query-parts generated
 	// by the shards are merged and returned to the caller.
@@ -2881,12 +2881,12 @@ type SplitQueryRequest struct {
 	//    located between two successive boundary rows.
 	//    This algorithm supports multiple split_column's of any type,
 	//    but is slower than EQUAL_SPLITS.
-	Algorithm query.SplitQueryRequest_Algorithm `protobuf:"varint,7,opt,name=algorithm,enum=query.SplitQueryRequest_Algorithm" json:"algorithm,omitempty"`
+	Algorithm query.SplitQueryRequest_Algorithm `protobuf:"varint,7,opt,name=algorithm,proto3,enum=query.SplitQueryRequest_Algorithm" json:"algorithm,omitempty"`
 	// TODO(erez): This field is no longer used by the server code.
 	// Remove this field after this new server code is released to prod.
 	// We must keep it for now, so that clients can still send it to the old
 	// server code currently in production.
-	UseSplitQueryV2      bool     `protobuf:"varint,8,opt,name=use_split_query_v2,json=useSplitQueryV2" json:"use_split_query_v2,omitempty"`
+	UseSplitQueryV2      bool     `protobuf:"varint,8,opt,name=use_split_query_v2,json=useSplitQueryV2,proto3" json:"use_split_query_v2,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2975,7 +2975,7 @@ func (m *SplitQueryRequest) GetUseSplitQueryV2() bool {
 // SplitQueryResponse is the returned value from SplitQuery.
 type SplitQueryResponse struct {
 	// splits contains the queries to run to fetch the entire data set.
-	Splits               []*SplitQueryResponse_Part `protobuf:"bytes,1,rep,name=splits" json:"splits,omitempty"`
+	Splits               []*SplitQueryResponse_Part `protobuf:"bytes,1,rep,name=splits,proto3" json:"splits,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
 	XXX_unrecognized     []byte                     `json:"-"`
 	XXX_sizecache        int32                      `json:"-"`
@@ -3014,9 +3014,9 @@ func (m *SplitQueryResponse) GetSplits() []*SplitQueryResponse_Part {
 
 type SplitQueryResponse_KeyRangePart struct {
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// key ranges to target the query to.
-	KeyRanges            []*topodata.KeyRange `protobuf:"bytes,2,rep,name=key_ranges,json=keyRanges" json:"key_ranges,omitempty"`
+	KeyRanges            []*topodata.KeyRange `protobuf:"bytes,2,rep,name=key_ranges,json=keyRanges,proto3" json:"key_ranges,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
 	XXX_unrecognized     []byte               `json:"-"`
 	XXX_sizecache        int32                `json:"-"`
@@ -3062,9 +3062,9 @@ func (m *SplitQueryResponse_KeyRangePart) GetKeyRanges() []*topodata.KeyRange {
 
 type SplitQueryResponse_ShardPart struct {
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// shards to target the query to.
-	Shards               []string `protobuf:"bytes,2,rep,name=shards" json:"shards,omitempty"`
+	Shards               []string `protobuf:"bytes,2,rep,name=shards,proto3" json:"shards,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -3110,14 +3110,14 @@ func (m *SplitQueryResponse_ShardPart) GetShards() []string {
 
 type SplitQueryResponse_Part struct {
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"`
+	Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
 	// key_range_part is set if the query should be executed by
 	// ExecuteKeyRanges.
-	KeyRangePart *SplitQueryResponse_KeyRangePart `protobuf:"bytes,2,opt,name=key_range_part,json=keyRangePart" json:"key_range_part,omitempty"`
+	KeyRangePart *SplitQueryResponse_KeyRangePart `protobuf:"bytes,2,opt,name=key_range_part,json=keyRangePart,proto3" json:"key_range_part,omitempty"`
 	// shard_part is set if the query should be executed by ExecuteShards.
-	ShardPart *SplitQueryResponse_ShardPart `protobuf:"bytes,3,opt,name=shard_part,json=shardPart" json:"shard_part,omitempty"`
+	ShardPart *SplitQueryResponse_ShardPart `protobuf:"bytes,3,opt,name=shard_part,json=shardPart,proto3" json:"shard_part,omitempty"`
 	// size is the approximate number of rows this query will return.
-	Size                 int64    `protobuf:"varint,4,opt,name=size" json:"size,omitempty"`
+	Size                 int64    `protobuf:"varint,4,opt,name=size,proto3" json:"size,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -3178,7 +3178,7 @@ func (m *SplitQueryResponse_Part) GetSize() int64 {
 // GetSrvKeyspaceRequest is the payload to GetSrvKeyspace.
 type GetSrvKeyspaceRequest struct {
 	// keyspace name to fetch.
-	Keyspace             string   `protobuf:"bytes,1,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace             string   `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -3218,7 +3218,7 @@ func (m *GetSrvKeyspaceRequest) GetKeyspace() string {
 // GetSrvKeyspaceResponse is the returned value from GetSrvKeyspace.
 type GetSrvKeyspaceResponse struct {
 	// srv_keyspace is the topology object for the SrvKeyspace.
-	SrvKeyspace          *topodata.SrvKeyspace `protobuf:"bytes,1,opt,name=srv_keyspace,json=srvKeyspace" json:"srv_keyspace,omitempty"`
+	SrvKeyspace          *topodata.SrvKeyspace `protobuf:"bytes,1,opt,name=srv_keyspace,json=srvKeyspace,proto3" json:"srv_keyspace,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -3259,24 +3259,24 @@ func (m *GetSrvKeyspaceResponse) GetSrvKeyspace() *topodata.SrvKeyspace {
 type UpdateStreamRequest struct {
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"`
+	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// keyspace to target the query to.
-	Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"`
+	Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// shard to target the query to, for unsharded keyspaces.
-	Shard string `protobuf:"bytes,3,opt,name=shard" json:"shard,omitempty"`
+	Shard string `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
 	// KeyRange to target the query to, for sharded keyspaces.
-	KeyRange *topodata.KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange" json:"key_range,omitempty"`
+	KeyRange *topodata.KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	// tablet_type is the type of tablets that this request is targeted to.
-	TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// timestamp is the timestamp to start the stream from.  It is
 	// unused is event is set, and we are only streaming from the shard
 	// described by event.shard.
-	Timestamp int64 `protobuf:"varint,6,opt,name=timestamp" json:"timestamp,omitempty"`
+	Timestamp int64 `protobuf:"varint,6,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	// event is the event to start the stream from.
 	// Note it is only used if we are streaming from exactly the same shard
 	// as this event was coming from. Otherwise we can't use this event,
 	// and will use the timestamp as a starting point.
-	Event                *query.EventToken `protobuf:"bytes,7,opt,name=event" json:"event,omitempty"`
+	Event                *query.EventToken `protobuf:"bytes,7,opt,name=event,proto3" json:"event,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -3358,13 +3358,13 @@ func (m *UpdateStreamRequest) GetEvent() *query.EventToken {
 // UpdateStreamResponse is streamed by UpdateStream.
 type UpdateStreamResponse struct {
 	// event is one event from the stream.
-	Event *query.StreamEvent `protobuf:"bytes,1,opt,name=event" json:"event,omitempty"`
+	Event *query.StreamEvent `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
 	// resume_timestamp is the timestamp to resume streaming from if the
 	// client is interrupted. If the Update Stream only goes to one
 	// shard, this is equal to event.timestamp. If the Update Stream
 	// goes to multiple shards and aggregates, this is the minimum value
 	// of the current timestamp for all shards.
-	ResumeTimestamp      int64    `protobuf:"varint,2,opt,name=resume_timestamp,json=resumeTimestamp" json:"resume_timestamp,omitempty"`
+	ResumeTimestamp      int64    `protobuf:"varint,2,opt,name=resume_timestamp,json=resumeTimestamp,proto3" json:"resume_timestamp,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
diff --git a/go/vt/proto/vtgateservice/vtgateservice.pb.go b/go/vt/proto/vtgateservice/vtgateservice.pb.go
index a4e0e248e9a..7d9302b07fe 100644
--- a/go/vt/proto/vtgateservice/vtgateservice.pb.go
+++ b/go/vt/proto/vtgateservice/vtgateservice.pb.go
@@ -33,8 +33,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Vitess service
-
+// VitessClient is the client API for Vitess service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type VitessClient interface {
 	// Execute tries to route the query to the right shard.
 	// It depends on the query and bind variables to provide enough
@@ -128,7 +129,7 @@ func NewVitessClient(cc *grpc.ClientConn) VitessClient {
 
 func (c *vitessClient) Execute(ctx context.Context, in *vtgate.ExecuteRequest, opts ...grpc.CallOption) (*vtgate.ExecuteResponse, error) {
 	out := new(vtgate.ExecuteResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/Execute", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/Execute", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -137,7 +138,7 @@ func (c *vitessClient) Execute(ctx context.Context, in *vtgate.ExecuteRequest, o
 
 func (c *vitessClient) ExecuteBatch(ctx context.Context, in *vtgate.ExecuteBatchRequest, opts ...grpc.CallOption) (*vtgate.ExecuteBatchResponse, error) {
 	out := new(vtgate.ExecuteBatchResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteBatch", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteBatch", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -145,7 +146,7 @@ func (c *vitessClient) ExecuteBatch(ctx context.Context, in *vtgate.ExecuteBatch
 }
 
 func (c *vitessClient) StreamExecute(ctx context.Context, in *vtgate.StreamExecuteRequest, opts ...grpc.CallOption) (Vitess_StreamExecuteClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Vitess_serviceDesc.Streams[0], c.cc, "/vtgateservice.Vitess/StreamExecute", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Vitess_serviceDesc.Streams[0], "/vtgateservice.Vitess/StreamExecute", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -178,7 +179,7 @@ func (x *vitessStreamExecuteClient) Recv() (*vtgate.StreamExecuteResponse, error
 
 func (c *vitessClient) ExecuteShards(ctx context.Context, in *vtgate.ExecuteShardsRequest, opts ...grpc.CallOption) (*vtgate.ExecuteShardsResponse, error) {
 	out := new(vtgate.ExecuteShardsResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteShards", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteShards", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -187,7 +188,7 @@ func (c *vitessClient) ExecuteShards(ctx context.Context, in *vtgate.ExecuteShar
 
 func (c *vitessClient) ExecuteKeyspaceIds(ctx context.Context, in *vtgate.ExecuteKeyspaceIdsRequest, opts ...grpc.CallOption) (*vtgate.ExecuteKeyspaceIdsResponse, error) {
 	out := new(vtgate.ExecuteKeyspaceIdsResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteKeyspaceIds", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteKeyspaceIds", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -196,7 +197,7 @@ func (c *vitessClient) ExecuteKeyspaceIds(ctx context.Context, in *vtgate.Execut
 
 func (c *vitessClient) ExecuteKeyRanges(ctx context.Context, in *vtgate.ExecuteKeyRangesRequest, opts ...grpc.CallOption) (*vtgate.ExecuteKeyRangesResponse, error) {
 	out := new(vtgate.ExecuteKeyRangesResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteKeyRanges", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteKeyRanges", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -205,7 +206,7 @@ func (c *vitessClient) ExecuteKeyRanges(ctx context.Context, in *vtgate.ExecuteK
 
 func (c *vitessClient) ExecuteEntityIds(ctx context.Context, in *vtgate.ExecuteEntityIdsRequest, opts ...grpc.CallOption) (*vtgate.ExecuteEntityIdsResponse, error) {
 	out := new(vtgate.ExecuteEntityIdsResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteEntityIds", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteEntityIds", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -214,7 +215,7 @@ func (c *vitessClient) ExecuteEntityIds(ctx context.Context, in *vtgate.ExecuteE
 
 func (c *vitessClient) ExecuteBatchShards(ctx context.Context, in *vtgate.ExecuteBatchShardsRequest, opts ...grpc.CallOption) (*vtgate.ExecuteBatchShardsResponse, error) {
 	out := new(vtgate.ExecuteBatchShardsResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteBatchShards", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteBatchShards", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -223,7 +224,7 @@ func (c *vitessClient) ExecuteBatchShards(ctx context.Context, in *vtgate.Execut
 
 func (c *vitessClient) ExecuteBatchKeyspaceIds(ctx context.Context, in *vtgate.ExecuteBatchKeyspaceIdsRequest, opts ...grpc.CallOption) (*vtgate.ExecuteBatchKeyspaceIdsResponse, error) {
 	out := new(vtgate.ExecuteBatchKeyspaceIdsResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteBatchKeyspaceIds", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/ExecuteBatchKeyspaceIds", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -231,7 +232,7 @@ func (c *vitessClient) ExecuteBatchKeyspaceIds(ctx context.Context, in *vtgate.E
 }
 
 func (c *vitessClient) StreamExecuteShards(ctx context.Context, in *vtgate.StreamExecuteShardsRequest, opts ...grpc.CallOption) (Vitess_StreamExecuteShardsClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Vitess_serviceDesc.Streams[1], c.cc, "/vtgateservice.Vitess/StreamExecuteShards", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Vitess_serviceDesc.Streams[1], "/vtgateservice.Vitess/StreamExecuteShards", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -263,7 +264,7 @@ func (x *vitessStreamExecuteShardsClient) Recv() (*vtgate.StreamExecuteShardsRes
 }
 
 func (c *vitessClient) StreamExecuteKeyspaceIds(ctx context.Context, in *vtgate.StreamExecuteKeyspaceIdsRequest, opts ...grpc.CallOption) (Vitess_StreamExecuteKeyspaceIdsClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Vitess_serviceDesc.Streams[2], c.cc, "/vtgateservice.Vitess/StreamExecuteKeyspaceIds", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Vitess_serviceDesc.Streams[2], "/vtgateservice.Vitess/StreamExecuteKeyspaceIds", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -295,7 +296,7 @@ func (x *vitessStreamExecuteKeyspaceIdsClient) Recv() (*vtgate.StreamExecuteKeys
 }
 
 func (c *vitessClient) StreamExecuteKeyRanges(ctx context.Context, in *vtgate.StreamExecuteKeyRangesRequest, opts ...grpc.CallOption) (Vitess_StreamExecuteKeyRangesClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Vitess_serviceDesc.Streams[3], c.cc, "/vtgateservice.Vitess/StreamExecuteKeyRanges", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Vitess_serviceDesc.Streams[3], "/vtgateservice.Vitess/StreamExecuteKeyRanges", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -328,7 +329,7 @@ func (x *vitessStreamExecuteKeyRangesClient) Recv() (*vtgate.StreamExecuteKeyRan
 
 func (c *vitessClient) Begin(ctx context.Context, in *vtgate.BeginRequest, opts ...grpc.CallOption) (*vtgate.BeginResponse, error) {
 	out := new(vtgate.BeginResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/Begin", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/Begin", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -337,7 +338,7 @@ func (c *vitessClient) Begin(ctx context.Context, in *vtgate.BeginRequest, opts
 
 func (c *vitessClient) Commit(ctx context.Context, in *vtgate.CommitRequest, opts ...grpc.CallOption) (*vtgate.CommitResponse, error) {
 	out := new(vtgate.CommitResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/Commit", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/Commit", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -346,7 +347,7 @@ func (c *vitessClient) Commit(ctx context.Context, in *vtgate.CommitRequest, opt
 
 func (c *vitessClient) Rollback(ctx context.Context, in *vtgate.RollbackRequest, opts ...grpc.CallOption) (*vtgate.RollbackResponse, error) {
 	out := new(vtgate.RollbackResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/Rollback", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/Rollback", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -355,7 +356,7 @@ func (c *vitessClient) Rollback(ctx context.Context, in *vtgate.RollbackRequest,
 
 func (c *vitessClient) ResolveTransaction(ctx context.Context, in *vtgate.ResolveTransactionRequest, opts ...grpc.CallOption) (*vtgate.ResolveTransactionResponse, error) {
 	out := new(vtgate.ResolveTransactionResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/ResolveTransaction", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/ResolveTransaction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -363,7 +364,7 @@ func (c *vitessClient) ResolveTransaction(ctx context.Context, in *vtgate.Resolv
 }
 
 func (c *vitessClient) MessageStream(ctx context.Context, in *vtgate.MessageStreamRequest, opts ...grpc.CallOption) (Vitess_MessageStreamClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Vitess_serviceDesc.Streams[4], c.cc, "/vtgateservice.Vitess/MessageStream", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Vitess_serviceDesc.Streams[4], "/vtgateservice.Vitess/MessageStream", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -396,7 +397,7 @@ func (x *vitessMessageStreamClient) Recv() (*query.MessageStreamResponse, error)
 
 func (c *vitessClient) MessageAck(ctx context.Context, in *vtgate.MessageAckRequest, opts ...grpc.CallOption) (*query.MessageAckResponse, error) {
 	out := new(query.MessageAckResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/MessageAck", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/MessageAck", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -405,7 +406,7 @@ func (c *vitessClient) MessageAck(ctx context.Context, in *vtgate.MessageAckRequ
 
 func (c *vitessClient) MessageAckKeyspaceIds(ctx context.Context, in *vtgate.MessageAckKeyspaceIdsRequest, opts ...grpc.CallOption) (*query.MessageAckResponse, error) {
 	out := new(query.MessageAckResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/MessageAckKeyspaceIds", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/MessageAckKeyspaceIds", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -414,7 +415,7 @@ func (c *vitessClient) MessageAckKeyspaceIds(ctx context.Context, in *vtgate.Mes
 
 func (c *vitessClient) SplitQuery(ctx context.Context, in *vtgate.SplitQueryRequest, opts ...grpc.CallOption) (*vtgate.SplitQueryResponse, error) {
 	out := new(vtgate.SplitQueryResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/SplitQuery", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/SplitQuery", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -423,7 +424,7 @@ func (c *vitessClient) SplitQuery(ctx context.Context, in *vtgate.SplitQueryRequ
 
 func (c *vitessClient) GetSrvKeyspace(ctx context.Context, in *vtgate.GetSrvKeyspaceRequest, opts ...grpc.CallOption) (*vtgate.GetSrvKeyspaceResponse, error) {
 	out := new(vtgate.GetSrvKeyspaceResponse)
-	err := grpc.Invoke(ctx, "/vtgateservice.Vitess/GetSrvKeyspace", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/vtgateservice.Vitess/GetSrvKeyspace", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -431,7 +432,7 @@ func (c *vitessClient) GetSrvKeyspace(ctx context.Context, in *vtgate.GetSrvKeys
 }
 
 func (c *vitessClient) UpdateStream(ctx context.Context, in *vtgate.UpdateStreamRequest, opts ...grpc.CallOption) (Vitess_UpdateStreamClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Vitess_serviceDesc.Streams[5], c.cc, "/vtgateservice.Vitess/UpdateStream", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Vitess_serviceDesc.Streams[5], "/vtgateservice.Vitess/UpdateStream", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -462,8 +463,7 @@ func (x *vitessUpdateStreamClient) Recv() (*vtgate.UpdateStreamResponse, error)
 	return m, nil
 }
 
-// Server API for Vitess service
-
+// VitessServer is the server API for Vitess service.
 type VitessServer interface {
 	// Execute tries to route the query to the right shard.
 	// It depends on the query and bind variables to provide enough
diff --git a/go/vt/proto/vtrpc/vtrpc.pb.go b/go/vt/proto/vtrpc/vtrpc.pb.go
index d3f112e6087..a65e8735874 100644
--- a/go/vt/proto/vtrpc/vtrpc.pb.go
+++ b/go/vt/proto/vtrpc/vtrpc.pb.go
@@ -293,15 +293,15 @@ type CallerID struct {
 	// came from an automated job or another system component.
 	// If the request comes directly from the Internet, or if the Vitess client
 	// takes action on its own accord, it is okay for this field to be absent.
-	Principal string `protobuf:"bytes,1,opt,name=principal" json:"principal,omitempty"`
+	Principal string `protobuf:"bytes,1,opt,name=principal,proto3" json:"principal,omitempty"`
 	// component describes the running process of the effective caller.
 	// It can for instance be the hostname:port of the servlet initiating the
 	// database call, or the container engine ID used by the servlet.
-	Component string `protobuf:"bytes,2,opt,name=component" json:"component,omitempty"`
+	Component string `protobuf:"bytes,2,opt,name=component,proto3" json:"component,omitempty"`
 	// subcomponent describes a component inisde the immediate caller which
 	// is responsible for generating is request. Suggested values are a
 	// servlet name or an API endpoint name.
-	Subcomponent         string   `protobuf:"bytes,3,opt,name=subcomponent" json:"subcomponent,omitempty"`
+	Subcomponent         string   `protobuf:"bytes,3,opt,name=subcomponent,proto3" json:"subcomponent,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -357,9 +357,9 @@ func (m *CallerID) GetSubcomponent() string {
 // We use this so the clients don't have to parse the error messages,
 // but instead can depend on the value of the code.
 type RPCError struct {
-	LegacyCode           LegacyErrorCode `protobuf:"varint,1,opt,name=legacy_code,json=legacyCode,enum=vtrpc.LegacyErrorCode" json:"legacy_code,omitempty"`
-	Message              string          `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
-	Code                 Code            `protobuf:"varint,3,opt,name=code,enum=vtrpc.Code" json:"code,omitempty"`
+	LegacyCode           LegacyErrorCode `protobuf:"varint,1,opt,name=legacy_code,json=legacyCode,proto3,enum=vtrpc.LegacyErrorCode" json:"legacy_code,omitempty"`
+	Message              string          `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	Code                 Code            `protobuf:"varint,3,opt,name=code,proto3,enum=vtrpc.Code" json:"code,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
diff --git a/go/vt/proto/vttest/vttest.pb.go b/go/vt/proto/vttest/vttest.pb.go
index f1041a15600..ffb667b13fa 100644
--- a/go/vt/proto/vttest/vttest.pb.go
+++ b/go/vt/proto/vttest/vttest.pb.go
@@ -23,11 +23,11 @@ type Shard struct {
 	// name has to be unique in a keyspace. For unsharded keyspaces, it
 	// should be '0'. For sharded keyspace, it should be derived from
 	// the keyrange, like '-80' or '40-80'.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// db_name_override is the mysql db name for this shard. Has to be
 	// globally unique. If not specified, we will by default use
 	// 'vt_<keyspace>_<shard>'.
-	DbNameOverride       string   `protobuf:"bytes,2,opt,name=db_name_override,json=dbNameOverride" json:"db_name_override,omitempty"`
+	DbNameOverride       string   `protobuf:"bytes,2,opt,name=db_name_override,json=dbNameOverride,proto3" json:"db_name_override,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -74,19 +74,19 @@ func (m *Shard) GetDbNameOverride() string {
 // Keyspace describes a single keyspace.
 type Keyspace struct {
 	// name has to be unique in a VTTestTopology.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// shards inside this keyspace. Ignored if redirect is set.
-	Shards []*Shard `protobuf:"bytes,2,rep,name=shards" json:"shards,omitempty"`
+	Shards []*Shard `protobuf:"bytes,2,rep,name=shards,proto3" json:"shards,omitempty"`
 	// sharding_column_name for this keyspace. Used for v2 calls, but not for v3.
-	ShardingColumnName string `protobuf:"bytes,3,opt,name=sharding_column_name,json=shardingColumnName" json:"sharding_column_name,omitempty"`
+	ShardingColumnName string `protobuf:"bytes,3,opt,name=sharding_column_name,json=shardingColumnName,proto3" json:"sharding_column_name,omitempty"`
 	// sharding_column_type for this keyspace. Used for v2 calls, but not for v3.
-	ShardingColumnType string `protobuf:"bytes,4,opt,name=sharding_column_type,json=shardingColumnType" json:"sharding_column_type,omitempty"`
+	ShardingColumnType string `protobuf:"bytes,4,opt,name=sharding_column_type,json=shardingColumnType,proto3" json:"sharding_column_type,omitempty"`
 	// redirects all traffic to another keyspace. If set, shards is ignored.
-	ServedFrom string `protobuf:"bytes,5,opt,name=served_from,json=servedFrom" json:"served_from,omitempty"`
+	ServedFrom string `protobuf:"bytes,5,opt,name=served_from,json=servedFrom,proto3" json:"served_from,omitempty"`
 	// number of replica tablets to instantiate. This includes the master tablet.
-	ReplicaCount int32 `protobuf:"varint,6,opt,name=replica_count,json=replicaCount" json:"replica_count,omitempty"`
+	ReplicaCount int32 `protobuf:"varint,6,opt,name=replica_count,json=replicaCount,proto3" json:"replica_count,omitempty"`
 	// number of rdonly tablets to instantiate.
-	RdonlyCount          int32    `protobuf:"varint,7,opt,name=rdonly_count,json=rdonlyCount" json:"rdonly_count,omitempty"`
+	RdonlyCount          int32    `protobuf:"varint,7,opt,name=rdonly_count,json=rdonlyCount,proto3" json:"rdonly_count,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -168,9 +168,9 @@ func (m *Keyspace) GetRdonlyCount() int32 {
 // VTTestTopology describes the keyspaces in the topology.
 type VTTestTopology struct {
 	// all keyspaces in the topology.
-	Keyspaces []*Keyspace `protobuf:"bytes,1,rep,name=keyspaces" json:"keyspaces,omitempty"`
+	Keyspaces []*Keyspace `protobuf:"bytes,1,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"`
 	// list of cells the keyspaces reside in. Vtgate is started in only the first cell.
-	Cells                []string `protobuf:"bytes,2,rep,name=cells" json:"cells,omitempty"`
+	Cells                []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
diff --git a/go/vt/proto/vtworkerdata/vtworkerdata.pb.go b/go/vt/proto/vtworkerdata/vtworkerdata.pb.go
index 87ef5c1d866..4944c62ba3c 100644
--- a/go/vt/proto/vtworkerdata/vtworkerdata.pb.go
+++ b/go/vt/proto/vtworkerdata/vtworkerdata.pb.go
@@ -21,7 +21,7 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 // ExecuteVtworkerCommandRequest is the payload for ExecuteVtworkerCommand.
 type ExecuteVtworkerCommandRequest struct {
-	Args                 []string `protobuf:"bytes,1,rep,name=args" json:"args,omitempty"`
+	Args                 []string `protobuf:"bytes,1,rep,name=args,proto3" json:"args,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -60,7 +60,7 @@ func (m *ExecuteVtworkerCommandRequest) GetArgs() []string {
 
 // ExecuteVtworkerCommandResponse is streamed back by ExecuteVtworkerCommand.
 type ExecuteVtworkerCommandResponse struct {
-	Event                *logutil.Event `protobuf:"bytes,1,opt,name=event" json:"event,omitempty"`
+	Event                *logutil.Event `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
diff --git a/go/vt/proto/vtworkerservice/vtworkerservice.pb.go b/go/vt/proto/vtworkerservice/vtworkerservice.pb.go
index b8833e0b607..015b0945e9d 100644
--- a/go/vt/proto/vtworkerservice/vtworkerservice.pb.go
+++ b/go/vt/proto/vtworkerservice/vtworkerservice.pb.go
@@ -32,8 +32,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Vtworker service
-
+// VtworkerClient is the client API for Vtworker service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type VtworkerClient interface {
 	// ExecuteVtworkerCommand allows to run a vtworker command by specifying the
 	// same arguments as on the command line.
@@ -49,7 +50,7 @@ func NewVtworkerClient(cc *grpc.ClientConn) VtworkerClient {
 }
 
 func (c *vtworkerClient) ExecuteVtworkerCommand(ctx context.Context, in *vtworkerdata.ExecuteVtworkerCommandRequest, opts ...grpc.CallOption) (Vtworker_ExecuteVtworkerCommandClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Vtworker_serviceDesc.Streams[0], c.cc, "/vtworkerservice.Vtworker/ExecuteVtworkerCommand", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Vtworker_serviceDesc.Streams[0], "/vtworkerservice.Vtworker/ExecuteVtworkerCommand", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -80,8 +81,7 @@ func (x *vtworkerExecuteVtworkerCommandClient) Recv() (*vtworkerdata.ExecuteVtwo
 	return m, nil
 }
 
-// Server API for Vtworker service
-
+// VtworkerServer is the server API for Vtworker service.
 type VtworkerServer interface {
 	// ExecuteVtworkerCommand allows to run a vtworker command by specifying the
 	// same arguments as on the command line.
diff --git a/go/vt/proto/workflow/workflow.pb.go b/go/vt/proto/workflow/workflow.pb.go
index f24d4457792..5b0fb41e1cd 100644
--- a/go/vt/proto/workflow/workflow.pb.go
+++ b/go/vt/proto/workflow/workflow.pb.go
@@ -78,13 +78,13 @@ func (TaskState) EnumDescriptor() ([]byte, []int) {
 type Workflow struct {
 	// uuid is set when the workflow is created, and immutable after
 	// that.
-	Uuid string `protobuf:"bytes,1,opt,name=uuid" json:"uuid,omitempty"`
+	Uuid string `protobuf:"bytes,1,opt,name=uuid,proto3" json:"uuid,omitempty"`
 	// factory_name is set with the name of the factory that created the
 	// job (and can also restart it). It is set at creation time, and
 	// immutable after that.
-	FactoryName string `protobuf:"bytes,2,opt,name=factory_name,json=factoryName" json:"factory_name,omitempty"`
+	FactoryName string `protobuf:"bytes,2,opt,name=factory_name,json=factoryName,proto3" json:"factory_name,omitempty"`
 	// name is the display name of the workflow.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// state describes the state of the job. A job is created as
 	// NotStarted, then the Workflow Manager picks it up and starts it,
 	// switching it to Running (and populating 'start_time').  The
@@ -92,7 +92,7 @@ type Workflow struct {
 	// necessary, and still be in Running state.  When done, it goes to
 	// Done, 'end_time' is populated, and 'error' is set if there was an
 	// error.
-	State WorkflowState `protobuf:"varint,4,opt,name=state,enum=workflow.WorkflowState" json:"state,omitempty"`
+	State WorkflowState `protobuf:"varint,4,opt,name=state,proto3,enum=workflow.WorkflowState" json:"state,omitempty"`
 	// data is workflow-specific stored data. It is usually a binary
 	// proto-encoded data structure. It can vary throughout the
 	// execution of the workflow.  It will not change after the workflow
@@ -100,16 +100,16 @@ type Workflow struct {
 	Data []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"`
 	// error is set if the job finished with an error. This field only
 	// makes sense if 'state' is Done.
-	Error string `protobuf:"bytes,6,opt,name=error" json:"error,omitempty"`
+	Error string `protobuf:"bytes,6,opt,name=error,proto3" json:"error,omitempty"`
 	// start_time is set when the workflow manager starts a workflow for
 	// the first time. This field only makes sense if 'state' is Running
 	// or Done.
-	StartTime int64 `protobuf:"varint,7,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime int64 `protobuf:"varint,7,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// end_time is set when the workflow is finished.
 	// This field only makes sense if 'state' is Done.
-	EndTime int64 `protobuf:"varint,8,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime int64 `protobuf:"varint,8,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// create_time is set when the workflow is created.
-	CreateTime           int64    `protobuf:"varint,9,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime           int64    `protobuf:"varint,9,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -207,13 +207,13 @@ type WorkflowCheckpoint struct {
 	// running workflow and the one which wrote the checkpoint. If they don't
 	// match, the workflow must not continue. The author of workflow must update
 	// this variable in their implementation when incompabilities are introduced.
-	CodeVersion int32 `protobuf:"varint,1,opt,name=code_version,json=codeVersion" json:"code_version,omitempty"`
+	CodeVersion int32 `protobuf:"varint,1,opt,name=code_version,json=codeVersion,proto3" json:"code_version,omitempty"`
 	// Task is the data structure that stores the execution status and the
 	// attributes of a task.
-	Tasks map[string]*Task `protobuf:"bytes,2,rep,name=tasks" json:"tasks,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Tasks map[string]*Task `protobuf:"bytes,2,rep,name=tasks,proto3" json:"tasks,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// settings includes workflow specific data, e.g. the resharding workflow
 	// would store the source shards and destination shards.
-	Settings             map[string]string `protobuf:"bytes,3,rep,name=settings" json:"settings,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Settings             map[string]string `protobuf:"bytes,3,rep,name=settings,proto3" json:"settings,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:"-"`
@@ -265,11 +265,11 @@ func (m *WorkflowCheckpoint) GetSettings() map[string]string {
 }
 
 type Task struct {
-	Id    string    `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
-	State TaskState `protobuf:"varint,2,opt,name=state,enum=workflow.TaskState" json:"state,omitempty"`
+	Id    string    `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	State TaskState `protobuf:"varint,2,opt,name=state,proto3,enum=workflow.TaskState" json:"state,omitempty"`
 	// attributes includes the parameters the task needs.
-	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"`
-	Error                string            `protobuf:"bytes,4,opt,name=error" json:"error,omitempty"`
+	Attributes           map[string]string `protobuf:"bytes,3,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Error                string            `protobuf:"bytes,4,opt,name=error,proto3" json:"error,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
diff --git a/go/vt/sqlparser/sql.go b/go/vt/sqlparser/sql.go
index bff8ec3af25..a409cc0f22f 100644
--- a/go/vt/sqlparser/sql.go
+++ b/go/vt/sqlparser/sql.go
@@ -6,6 +6,7 @@ package sqlparser
 import __yyfmt__ "fmt"
 
 //line sql.y:18
+
 func setParseTree(yylex interface{}, stmt Statement) {
 	yylex.(*Tokenizer).ParseTree = stmt
 }
diff --git a/go/vt/tlstest/tlstest.go b/go/vt/tlstest/tlstest.go
index d110dd8215e..295dddcb017 100644
--- a/go/vt/tlstest/tlstest.go
+++ b/go/vt/tlstest/tlstest.go
@@ -34,42 +34,55 @@ const (
 
 	caConfig = `
 [ req ]
- default_bits           = 1024
+ default_bits           = 4096
  default_keyfile        = keyfile.pem
  distinguished_name     = req_distinguished_name
  attributes             = req_attributes
+ x509_extensions       = req_ext
  prompt                 = no
  output_password        = mypass
 [ req_distinguished_name ]
  C                      = US
  ST                     = California
  L                      = Mountain View
- O                      = Google
+ O                      = Vitessio
  OU                     = Vitess
  CN                     = CA
  emailAddress           = test@email.address
 [ req_attributes ]
  challengePassword      = A challenge password
+[ req_ext ]
+ basicConstraints       = CA:TRUE
+
 `
 
 	certConfig = `
 [ req ]
- default_bits           = 1024
+ default_bits           = 4096
  default_keyfile        = keyfile.pem
  distinguished_name     = req_distinguished_name
  attributes             = req_attributes
+ req_extensions        = req_ext
  prompt                 = no
  output_password        = mypass
 [ req_distinguished_name ]
  C                      = US
  ST                     = California
  L                      = Mountain View
- O                      = Google
+ O                      = Vitessio
  OU                     = Vitess
  CN                     = %s
  emailAddress           = test@email.address
 [ req_attributes ]
  challengePassword      = A challenge password
+[ req_ext ]
+ basicConstraints       = CA:TRUE
+ subjectAltName         = @alternate_names
+ extendedKeyUsage       =serverAuth,clientAuth
+[ alternate_names ]
+ DNS.1                  = localhost
+ DNS.2                  = 127.0.0.1
+ DNS.3                  = %s
 `
 )
 
@@ -116,7 +129,7 @@ func CreateSignedCert(root, parent, serial, name, commonName string) {
 	req := path.Join(root, name+"-req.pem")
 
 	config := path.Join(root, name+".config")
-	if err := ioutil.WriteFile(config, []byte(fmt.Sprintf(certConfig, commonName)), os.ModePerm); err != nil {
+	if err := ioutil.WriteFile(config, []byte(fmt.Sprintf(certConfig, commonName, commonName)), os.ModePerm); err != nil {
 		log.Fatalf("cannot write file %v: %v", config, err)
 	}
 	openssl("req", "-newkey", "rsa:2048", "-days", "3600", "-nodes",
@@ -130,5 +143,7 @@ func CreateSignedCert(root, parent, serial, name, commonName string) {
 		"-CA", caCert,
 		"-CAkey", caKey,
 		"-set_serial", serial,
+		"-extensions", "req_ext",
+		"-extfile", config,
 		"-out", cert)
 }
diff --git a/go/vt/vtexplain/vtexplain.go b/go/vt/vtexplain/vtexplain.go
index 8176890a3a2..9cc92cb24fa 100644
--- a/go/vt/vtexplain/vtexplain.go
+++ b/go/vt/vtexplain/vtexplain.go
@@ -173,6 +173,9 @@ func Init(vSchemaStr, sqlSchema string, opts *Options) error {
 func Stop() {
 	// Cleanup all created fake dbs.
 	if explainTopo != nil {
+		for _, conn := range explainTopo.TabletConns {
+			conn.tsv.StopService()
+		}
 		for _, conn := range explainTopo.TabletConns {
 			conn.db.Close()
 		}
diff --git a/go/vt/vtgate/engine/route.go b/go/vt/vtgate/engine/route.go
index c2ab138b9f8..470cc8f93c1 100644
--- a/go/vt/vtgate/engine/route.go
+++ b/go/vt/vtgate/engine/route.go
@@ -32,6 +32,7 @@ import (
 	"vitess.io/vitess/go/vt/vtgate/vindexes"
 
 	querypb "vitess.io/vitess/go/vt/proto/query"
+	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 )
 
 var _ Primitive = (*Route)(nil)
@@ -50,6 +51,10 @@ type Route struct {
 	// This bypases the core of the v3 engine.
 	TargetDestination key.Destination
 
+	// TargetTabletType specifies an explicit target destination tablet type
+	// this is only used in conjunction with TargetDestination
+	TargetTabletType topodatapb.TabletType
+
 	// Query specifies the query to be executed.
 	Query string
 
diff --git a/go/vt/vtgate/engine/update.go b/go/vt/vtgate/engine/update.go
index 6f013541b3a..83a48c32f31 100644
--- a/go/vt/vtgate/engine/update.go
+++ b/go/vt/vtgate/engine/update.go
@@ -42,6 +42,9 @@ type Update struct {
 	// Keyspace specifies the keyspace to send the query to.
 	Keyspace *vindexes.Keyspace
 
+	// TargetDestination specifies the destination to send the query to.
+	TargetDestination key.Destination
+
 	// Query specifies the query to be executed.
 	Query string
 
@@ -115,12 +118,18 @@ const (
 	// UpdateScatter is for routing a scattered
 	// update statement.
 	UpdateScatter
+	// UpdateByDestination is to route explicitly to a given
+	// target destination. Is used when the query explicitly sets a target destination:
+	// in the clause:
+	// e.g: UPDATE `keyspace[-]`.x1 SET foo=1
+	UpdateByDestination
 )
 
 var updName = map[UpdateOpcode]string{
-	UpdateUnsharded: "UpdateUnsharded",
-	UpdateEqual:     "UpdateEqual",
-	UpdateScatter:   "UpdateScatter",
+	UpdateUnsharded:     "UpdateUnsharded",
+	UpdateEqual:         "UpdateEqual",
+	UpdateScatter:       "UpdateScatter",
+	UpdateByDestination: "UpdateByDestination",
 }
 
 // MarshalJSON serializes the UpdateOpcode as a JSON string.
@@ -143,6 +152,8 @@ func (upd *Update) Execute(vcursor VCursor, bindVars map[string]*querypb.BindVar
 		return upd.execUpdateEqual(vcursor, bindVars)
 	case UpdateScatter:
 		return upd.execUpdateByDestination(vcursor, bindVars, key.DestinationAllShards{})
+	case UpdateByDestination:
+		return upd.execUpdateByDestination(vcursor, bindVars, upd.TargetDestination)
 	default:
 		// Unreachable.
 		return nil, fmt.Errorf("unsupported opcode: %v", upd)
diff --git a/go/vt/vtgate/planbuilder/from.go b/go/vt/vtgate/planbuilder/from.go
index ed1c761dc68..af0319a3dfe 100644
--- a/go/vt/vtgate/planbuilder/from.go
+++ b/go/vt/vtgate/planbuilder/from.go
@@ -157,7 +157,7 @@ func (pb *primitiveBuilder) buildTablePrimitive(tableExpr *sqlparser.AliasedTabl
 		return nil
 	}
 
-	table, vindex, _, _, destTarget, err := pb.vschema.FindTableOrVindex(tableName)
+	table, vindex, _, destTableType, destTarget, err := pb.vschema.FindTableOrVindex(tableName)
 	if err != nil {
 		return err
 	}
@@ -183,6 +183,7 @@ func (pb *primitiveBuilder) buildTablePrimitive(tableExpr *sqlparser.AliasedTabl
 			Opcode:            engine.SelectScatter,
 			Keyspace:          table.Keyspace,
 			TargetDestination: destTarget,
+			TargetTabletType:  destTableType,
 		}
 		return nil
 	}
diff --git a/go/vt/vtgate/planbuilder/update.go b/go/vt/vtgate/planbuilder/update.go
index dc7f6eb94b8..85a9c174307 100644
--- a/go/vt/vtgate/planbuilder/update.go
+++ b/go/vt/vtgate/planbuilder/update.go
@@ -25,6 +25,7 @@ import (
 	"vitess.io/vitess/go/vt/vtgate/engine"
 	"vitess.io/vitess/go/vt/vtgate/vindexes"
 
+	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
 )
 
@@ -42,9 +43,6 @@ func buildUpdatePlan(upd *sqlparser.Update, vschema ContextVSchema) (*engine.Upd
 	if !ok {
 		return nil, errors.New("unsupported: multi-table/vindex update statement in sharded keyspace")
 	}
-	if rb.ERoute.TargetDestination != nil {
-		return nil, errors.New("unsupported: UPDATE with a target destination")
-	}
 	eupd.Keyspace = rb.ERoute.Keyspace
 	if !eupd.Keyspace.Sharded {
 		// We only validate non-table subexpressions because the previous analysis has already validated them.
@@ -76,6 +74,16 @@ func buildUpdatePlan(upd *sqlparser.Update, vschema ContextVSchema) (*engine.Upd
 		return nil, errors.New("internal error: table.vindexTable is mysteriously nil")
 	}
 	var err error
+
+	if rb.ERoute.TargetDestination != nil {
+		if rb.ERoute.TargetTabletType != topodatapb.TabletType_MASTER {
+			return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unsupported: UPDATE statement with a replica target")
+		}
+		eupd.Opcode = engine.UpdateByDestination
+		eupd.TargetDestination = rb.ERoute.TargetDestination
+		return eupd, nil
+	}
+
 	eupd.Vindex, eupd.Values, err = getDMLRouting(upd.Where, eupd.Table)
 	if err != nil {
 		eupd.Opcode = engine.UpdateScatter
diff --git a/go/vt/vttablet/tabletmanager/rpc_server.go b/go/vt/vttablet/tabletmanager/rpc_server.go
index 7b5bdc19de8..4720ae1a8b7 100644
--- a/go/vt/vttablet/tabletmanager/rpc_server.go
+++ b/go/vt/vttablet/tabletmanager/rpc_server.go
@@ -89,7 +89,7 @@ func (agent *ActionAgent) HandleRPCPanic(ctx context.Context, name string, args,
 	if *err != nil {
 		// error case
 		log.Warningf("TabletManager.%v(%v)(on %v from %v) error: %v", name, args, topoproto.TabletAliasString(agent.TabletAlias), from, (*err).Error())
-		*err = vterrors.Wrapf(*err, "TabletManager.%v on %v error: %v", name, topoproto.TabletAliasString(agent.TabletAlias))
+		*err = vterrors.Wrapf(*err, "TabletManager.%v on %v error: %v", name, topoproto.TabletAliasString(agent.TabletAlias), (*err).Error())
 	} else {
 		// success case
 		log.Infof("TabletManager.%v(%v)(on %v from %v): %#v", name, args, topoproto.TabletAliasString(agent.TabletAlias), from, reply)
diff --git a/go/vt/worker/chunk.go b/go/vt/worker/chunk.go
index 9a005b7956e..ba0865769ad 100644
--- a/go/vt/worker/chunk.go
+++ b/go/vt/worker/chunk.go
@@ -97,7 +97,7 @@ func generateChunks(ctx context.Context, wr *wrangler.Wrangler, tablet *topodata
 	qr, err := wr.TabletManagerClient().ExecuteFetchAsApp(shortCtx, tablet, true, []byte(query), 1)
 	cancel()
 	if err != nil {
-		return nil, vterrors.Wrapf(err, "tablet: %v, table: %v: cannot determine MIN and MAX of the first primary key column. ExecuteFetchAsApp: %v", topoproto.TabletAliasString(tablet.Alias), td.Name)
+		return nil, vterrors.Wrapf(err, "tablet: %v, table: %v: cannot determine MIN and MAX of the first primary key column. ExecuteFetchAsApp: %v", topoproto.TabletAliasString(tablet.Alias), td.Name, err)
 	}
 	if len(qr.Rows) != 1 {
 		return nil, fmt.Errorf("tablet: %v, table: %v: cannot determine MIN and MAX of the first primary key column. Zero rows were returned", topoproto.TabletAliasString(tablet.Alias), td.Name)
diff --git a/go/vt/zkctl/zksrv.sh b/go/vt/zkctl/zksrv.sh
index e210fb9a693..30f4f2e1ef4 100755
--- a/go/vt/zkctl/zksrv.sh
+++ b/go/vt/zkctl/zksrv.sh
@@ -21,7 +21,7 @@ logdir="$1"
 config="$2"
 pidfile="$3"
 
-zk_ver=3.4.10
+zk_ver=3.4.13
 classpath="$VTROOT/dist/vt-zookeeper-$zk_ver/lib/zookeeper-$zk_ver-fatjar.jar:/usr/local/lib/zookeeper-$zk_ver-fatjar.jar:/usr/share/java/zookeeper-$zk_ver.jar"
 
 mkdir -p "$logdir"
diff --git a/helm/vitess/Chart.yaml b/helm/vitess/Chart.yaml
index 902611d82c0..d4ec24f79f7 100644
--- a/helm/vitess/Chart.yaml
+++ b/helm/vitess/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: vitess
-version: 0.9.0
+version: 1.0.0
 description: Single-Chart Vitess Cluster
 keywords:
   - vitess
diff --git a/helm/vitess/README.md b/helm/vitess/README.md
index 9e58d6b7fed..4b8154ed531 100644
--- a/helm/vitess/README.md
+++ b/helm/vitess/README.md
@@ -11,8 +11,6 @@ This chart creates a Vitess cluster on Kubernetes in a single
 It currently includes all dependencies (e.g. etcd) and Vitess components
 (vtctld, vtgate, vttablet) inline (in `templates/`) rather than as sub-charts.
 
-**WARNING: This chart should be considered Beta.**
-
 ## Prerequisites
 
 * Install [etcd-operator](https://github.com/coreos/etcd-operator) in the
@@ -98,7 +96,7 @@ topology:
                     replicas: 2
 ```
 
-### Separate pools of replicas and rdonly tablets 
+### Separate pools of replicas and rdonly tablets
 
 ```
 topology:
@@ -292,7 +290,7 @@ topology:
 
 pmm:
   enabled: true
-  pmmTag: "1.15.0"
+  pmmTag: "1.17.0"
   client:
     resources:
       requests:
@@ -335,10 +333,10 @@ Each component of vitess requires a certificate and private key to secure incomi
 vttablet:
   extraFlags:
     # configure which certificates to use for serving grpc requests
-    grpc_cert: /vt/usersecrets/vttablet-tls/vttablet.pem 
+    grpc_cert: /vt/usersecrets/vttablet-tls/vttablet.pem
     grpc_key: /vt/usersecrets/vttablet-tls/vttablet-key.pem
-    tablet_grpc_ca: /vt/usersecrets/vttablet-tls/vitess-ca.pem 
-    tablet_grpc_server_name: vttablet 
+    tablet_grpc_ca: /vt/usersecrets/vttablet-tls/vitess-ca.pem
+    tablet_grpc_server_name: vttablet
   secrets:
   - vttablet-tls
 
@@ -406,7 +404,7 @@ data:
 
 An example vault configuration, which is provided by the `vttablet-vault`-Secret in the above example:
 ```
-vault_url = https://10.0.0.1:8200                                                                                
+vault_url = https://10.0.0.1:8200
 secret_mount_point = vitess
 token = 11111111-1111-1111-1111111111
 vault_ca = /vt/usersecrets/vttablet-vault/vault-ca-bundle.pem
diff --git a/helm/vitess/templates/_orchestrator.tpl b/helm/vitess/templates/_orchestrator.tpl
index 3a6fd658ce6..c17308f330c 100644
--- a/helm/vitess/templates/_orchestrator.tpl
+++ b/helm/vitess/templates/_orchestrator.tpl
@@ -89,7 +89,7 @@ spec:
       containers:
         - name: orchestrator
           image: {{ $orc.image | quote }}
-          imagePullPolicy: Always
+          ImagePullPolicy: IfNotPresent
           ports:
             - containerPort: 3000
               name: web
@@ -124,7 +124,7 @@ spec:
 
         - name: recovery-log
           image: vitess/logtail:latest
-          imagePullPolicy: Always
+          ImagePullPolicy: IfNotPresent
           env:
           - name: TAIL_FILEPATH
             value: /tmp/recovery.log
@@ -134,7 +134,7 @@ spec:
 
         - name: audit-log
           image: vitess/logtail:latest
-          imagePullPolicy: Always
+          ImagePullPolicy: IfNotPresent
           env:
           - name: TAIL_FILEPATH
             value: /tmp/orchestrator-audit.log
diff --git a/helm/vitess/templates/_pmm.tpl b/helm/vitess/templates/_pmm.tpl
index 2d3c7131f00..522ae60d4ac 100644
--- a/helm/vitess/templates/_pmm.tpl
+++ b/helm/vitess/templates/_pmm.tpl
@@ -36,7 +36,7 @@ metadata:
 spec:
   serviceName: pmm
   replicas: 1
-  updateStrategy: 
+  updateStrategy:
     type: RollingUpdate
   selector:
     matchLabels:
@@ -65,7 +65,7 @@ spec:
 
           env:
             - name: DISABLE_UPDATES
-              value: "false"
+              value: "true"
 
             - name: DISABLE_TELEMETRY
               value: {{ $pmm.server.env.disableTelemetry | quote }}
@@ -81,7 +81,7 @@ spec:
 
             - name: METRICS_MEMORY
               value: {{ $pmm.server.env.metricsMemory | quote }}
-        
+
           command: ["bash"]
           args:
             - "-c"
@@ -115,7 +115,7 @@ spec:
               ln -s /pmmdata/consul-data /opt/
               ln -s /pmmdata/mysql /var/lib/
               ln -s /pmmdata/grafana /var/lib/
-              
+
               /opt/entrypoint.sh
 
   volumeClaimTemplates:
@@ -137,7 +137,7 @@ spec:
 
 - name: "pmm-client"
   image: "vitess/pmm-client:{{ $pmm.pmmTag }}"
-  imagePullPolicy: Always
+  ImagePullPolicy: IfNotPresent
   volumeMounts:
     - name: vtdataroot
       mountPath: "/vtdataroot"
@@ -160,27 +160,46 @@ spec:
     - |
       set -ex
 
-      mkdir -p /vtdataroot/pmm
-
-      # redirect logs to PV
+      # Redirect pmm-client data to persistent volume
+      if [ ! -d /vtdataroot/pmm ]; then
+        FIRST_RUN=1
+        mkdir -p /vtdataroot/pmm/percona
+        mkdir -p /vtdataroot/pmm/init.d
+      fi
+
+      mv /usr/local/percona /usr/local/percona_tmp
+      mv /etc/init.d /etc/init.d_tmp
+      ln -s /vtdataroot/pmm/percona /usr/local/percona
+      ln -s /vtdataroot/pmm/init.d /etc/init.d
       ln -s /vtdataroot/pmm/pmm-mysql-metrics-42002.log /var/log/pmm-mysql-metrics-42002.log
 
-      # --force is used because the pod ip address may have changed
-      pmm-admin config --server pmm.{{ $namespace }} --force
+      # workaround for when pod ips change
+      if [ ! -z "$FIRST_RUN" ]; then
+        cp -r /usr/local/percona_tmp/* /vtdataroot/pmm/percona || :
+        cp -r /etc/init.d_tmp/* /vtdataroot/pmm/init.d || :
+        pmm-admin stop --all
+        pmm-admin rm --all
+      fi
 
-      # creates a systemd service
+      pmm-admin config --server pmm.{{ $namespace }} --bind-address `hostname -I` --client-address ${HOSTNAME}.vttablet --force
+      pmm-admin repair
+
+      # wait for mysql to be available before registering
       until [ -e /vtdataroot/tabletdata/mysql.sock ]; do
-        echo "Waiting for mysql.sock"
+        echo "Waiting for mysql.sock file"
         sleep 1
       done
+
+      # creates systemd services
       pmm-admin add mysql:metrics --user root --socket /vtdataroot/tabletdata/mysql.sock --force
+      pmm-admin add mysql:queries --user root --socket /vtdataroot/tabletdata/mysql.sock --force --query-source=perfschema
 
       # keep the container alive but still responsive to stop requests
       trap : TERM INT; sleep infinity & wait
 
 - name: pmm-client-metrics-log
   image: vitess/logtail:latest
-  imagePullPolicy: Always
+  ImagePullPolicy: IfNotPresent
   env:
   - name: TAIL_FILEPATH
     value: /vtdataroot/pmm/pmm-mysql-metrics-42002.log
diff --git a/helm/vitess/templates/_vtctld.tpl b/helm/vitess/templates/_vtctld.tpl
index 44d9c32553c..765898c1cfe 100644
--- a/helm/vitess/templates/_vtctld.tpl
+++ b/helm/vitess/templates/_vtctld.tpl
@@ -60,7 +60,7 @@ spec:
       containers:
         - name: vtctld
           image: vitess/vtctld:{{$vitessTag}}
-          imagePullPolicy: Always
+          ImagePullPolicy: IfNotPresent
           readinessProbe:
             httpGet:
               path: /debug/health
diff --git a/helm/vitess/templates/_vtgate.tpl b/helm/vitess/templates/_vtgate.tpl
index a0f861d6654..585a1a26562 100644
--- a/helm/vitess/templates/_vtgate.tpl
+++ b/helm/vitess/templates/_vtgate.tpl
@@ -75,7 +75,7 @@ spec:
       containers:
         - name: vtgate
           image: vitess/vtgate:{{$vitessTag}}
-          imagePullPolicy: Always
+          ImagePullPolicy: IfNotPresent
           readinessProbe:
             httpGet:
               path: /debug/health
@@ -224,7 +224,7 @@ affinity:
 
 - name: init-mysql-creds
   image: "vitess/vtgate:{{$vitessTag}}"
-  imagePullPolicy: Always
+  ImagePullPolicy: IfNotPresent
   volumeMounts:
     - name: creds
       mountPath: "/mysqlcreds"
diff --git a/helm/vitess/templates/_vttablet.tpl b/helm/vitess/templates/_vttablet.tpl
index eba76e57e02..66e3867a865 100644
--- a/helm/vitess/templates/_vttablet.tpl
+++ b/helm/vitess/templates/_vttablet.tpl
@@ -162,7 +162,7 @@ spec:
 
 - name: "init-mysql"
   image: "vitess/mysqlctld:{{$vitessTag}}"
-  imagePullPolicy: Always
+  ImagePullPolicy: IfNotPresent
   volumeMounts:
     - name: vtdataroot
       mountPath: "/vtdataroot"
@@ -203,7 +203,7 @@ spec:
 
 - name: init-vttablet
   image: "vitess/vtctl:{{$vitessTag}}"
-  imagePullPolicy: Always
+  ImagePullPolicy: IfNotPresent
   volumeMounts:
     - name: vtdataroot
       mountPath: "/vtdataroot"
@@ -268,7 +268,7 @@ spec:
 
 - name: vttablet
   image: "vitess/vttablet:{{$vitessTag}}"
-  imagePullPolicy: Always
+  ImagePullPolicy: IfNotPresent
   readinessProbe:
     httpGet:
       path: /debug/health
@@ -428,7 +428,7 @@ spec:
 
 - name: mysql
   image: {{.mysqlImage | default $defaultVttablet.mysqlImage | quote}}
-  imagePullPolicy: Always
+  ImagePullPolicy: IfNotPresent
   readinessProbe:
     exec:
       command: ["mysqladmin", "ping", "-uroot", "--socket=/vtdataroot/tabletdata/mysql.sock"]
@@ -506,7 +506,7 @@ spec:
 
 - name: logrotate
   image: vitess/logrotate:latest
-  imagePullPolicy: Always
+  ImagePullPolicy: IfNotPresent
   volumeMounts:
     - name: vtdataroot
       mountPath: /vtdataroot
@@ -520,7 +520,7 @@ spec:
 
 - name: error-log
   image: vitess/logtail:latest
-  imagePullPolicy: Always
+  ImagePullPolicy: IfNotPresent
 
   env:
   - name: TAIL_FILEPATH
@@ -538,7 +538,7 @@ spec:
 
 - name: slow-log
   image: vitess/logtail:latest
-  imagePullPolicy: Always
+  ImagePullPolicy: IfNotPresent
 
   env:
   - name: TAIL_FILEPATH
@@ -556,7 +556,7 @@ spec:
 
 - name: general-log
   image: vitess/logtail:latest
-  imagePullPolicy: Always
+  ImagePullPolicy: IfNotPresent
 
   env:
   - name: TAIL_FILEPATH
diff --git a/helm/vitess/values.yaml b/helm/vitess/values.yaml
index 7b4fc6a7ef2..63db7cca30f 100644
--- a/helm/vitess/values.yaml
+++ b/helm/vitess/values.yaml
@@ -55,16 +55,16 @@ config:
     #########
 
     # AWS region to use
-    # s3_backup_aws_region: "us-east-1"
+    # s3_backup_aws_region: us-east-1
 
     # S3 bucket to use for backups
-    # s3_backup_storage_bucket: "vitess-backups"
+    # s3_backup_storage_bucket: vitess-backups
 
     # root prefix for all backup-related object names
-    # s3_backup_storage_root: "vtbackups"
+    # s3_backup_storage_root: vtbackups
 
     # server-side encryption algorithm (e.g., AES256, aws:kms)
-    # s3_backup_server_side_encryption: "AES256"
+    # s3_backup_server_side_encryption: AES256
 
     # secret that contains AWS S3 credentials file with read/write access to the bucket
     # kubectl create secret generic s3-credentials --from-file=s3-creds
@@ -76,15 +76,63 @@ topology:
     etcd:
       replicas: 3
   cells:
-    - name: "zone1"
+    - name: zone1
 
       # set failure-domain.beta.kubernetes.io/region
       # region: eastus
 
+      ## You MUST set up at least one keyspace, as these are what actually define and
+      #  create the Vitess cluster
+      #
+      # keyspaces:
+      #   - name: "commerce"
+      #     shards:
+      #       - name: "0"
+      #         tablets:
+      #           - type: "replica"
+      #             vttablet:
+      #               replicas: 2
+
+      ##    this defines named jobs that will run vtctlclient ApplySchema to initialize
+      #     your tables
+      #
+      #     schema:
+      #       phase1: |-
+      #         create table product(
+      #           sku varbinary(128),
+      #           description varbinary(128),
+      #           price bigint,
+      #           primary key(sku)
+      #         );
+      #         create table customer(
+      #           user_id bigint not null auto_increment,
+      #           email varbinary(128),
+      #           primary key(user_id)
+      #         );
+      #         create table corder(
+      #           order_id bigint not null auto_increment,
+      #           user_id bigint,
+      #           product_id bigint,
+      #           msrp bigint,
+      #           primary key(order_id)
+      #         );
+
+      ##    this defines named jobs that will run vtctlclient ApplyVSchema
+      #
+      #     vschema:
+      #       phase1: |-
+      #         {
+      #           "tables": {
+      #             "product": {},
+      #             "customer": {},
+      #             "corder": {}
+      #           }
+      #         }
+
       # enable or disable mysql protocol support, with accompanying auth details
       mysqlProtocol:
         enabled: false
-        authType: "secret"
+        authType: secret
         # authType can be: none or secret. For secret, perform the following changes:
         # username: myuser
         # this is the secret that will be mounted as the user password
@@ -98,7 +146,7 @@ topology:
       vtgate:
         replicas: 3
         # if maxReplicas is higher than replicas, an HPA will be created
-        maxReplicas: 6
+        # maxReplicas: 6
 
 jobs:
   # examples:
@@ -112,69 +160,67 @@ jobs:
 
 # Default values for etcd resources defined in 'topology'
 etcd:
-  version: "3.2.13"
+  version: "3.3.10"
   replicas: 3
   resources:
-    limits:
-      cpu: 300m
-      memory: 200Mi
     requests:
       cpu: 200m
       memory: 100Mi
 
 # Default values for vtctld resources defined in 'topology'
 vtctld:
-  serviceType: "ClusterIP"
-  vitessTag: "latest"
+  serviceType: ClusterIP
+  vitessTag: latest
   resources:
-    limits:
-      cpu: 100m
-      memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
   extraFlags: {}
   secrets: [] # secrets are mounted under /vt/usersecrets/{secretname}
 
 # Default values for vtgate resources defined in 'topology'
 vtgate:
-  serviceType: "ClusterIP"
-  vitessTag: "latest"
+  serviceType: ClusterIP
+  vitessTag: latest
   resources:
-    limits:
-      cpu: 500m
-      memory: 512Mi
+    # requests:
+    #   cpu: 500m
+    #   memory: 512Mi
   extraFlags: {}
   secrets: [] # secrets are mounted under /vt/usersecrets/{secretname}
 
 # Default values for vtctlclient resources defined in 'topology'
 vtctlclient:
-  vitessTag: "latest"
+  vitessTag: latest
   extraFlags: {}
   secrets: [] # secrets are mounted under /vt/usersecrets/{secretname}
 
 # Default values for vtworker resources defined in 'jobs'
 vtworker:
-  vitessTag: "latest"
+  vitessTag: latest
   extraFlags: {}
   resources:
-    limits:
-      cpu: 500m
-      memory: 512Mi
+    # requests:
+    #   cpu: 500m
+    #   memory: 512Mi
   secrets: [] # secrets are mounted under /vt/usersecrets/{secretname}
 
 
 # Default values for vttablet resources defined in 'topology'
 vttablet:
-  vitessTag: "latest"
+  vitessTag: latest
 
   # valid values are
+  # - mysql56 (for MySQL 8.0)
   # - mysql56 (for MySQL/Percona 5.6 or 5.7)
   # - mariadb (for MariaDB <= 10.2)
   # - mariadb103 (for MariaDB >= 10.3)
   # the flavor determines the base my.cnf file for vitess to function
-  flavor: "mysql56"
+  flavor: mysql56
 
-  mysqlImage: "percona:5.7.20"
-  # mysqlImage: "mysql:5.7.20"
-  # mysqlImage: "mariadb:10.3.4"
+  mysqlImage: percona:5.7.23
+  # mysqlImage: mysql:5.7.24
+  # mysqlImage: mariadb:10.3.11
 
   enableHeartbeat: false
 
@@ -193,7 +239,7 @@ vttablet:
 
   # mysqlSize can be "test" or "prod". Default is "prod".
   # If the value is "test", then mysql is instanitated with a smaller footprint.
-  mysqlSize: "prod"
+  mysqlSize: prod
 
   # Additional flags that will be appended to the vttablet command
   extraFlags: {}
@@ -203,14 +249,16 @@ vttablet:
 
   resources:
     # common production values 2-4CPU/4-8Gi RAM
-    limits:
-      cpu: 500m
-      memory: 1Gi
+    # requests:
+    #   cpu: 2
+    #   memory: 4Gi
+
   mysqlResources:
     # common production values 4CPU/8-16Gi RAM
-    limits:
-      cpu: 500m
-      memory: 1Gi
+    # requests:
+    #   cpu: 4
+    #   memory: 8Gi
+
   # PVC for mysql
   dataVolumeClaimAnnotations:
   dataVolumeClaimSpec:
@@ -218,37 +266,36 @@ vttablet:
     # managed-premium (Azure)
     # standard (AWS) - not sure what the default class is for ssd
     # Note: Leave storageClassName unset to use cluster-specific default class.
-    #storageClassName: "pd-ssd"
+    #storageClassName: pd-ssd
     accessModes: ["ReadWriteOnce"]
     resources:
       requests:
-        storage: "10Gi"
+        storage: 10Gi
 
 # Default values for pmm
 pmm:
   enabled: false
-  pmmTag: "1.15.0"
+  pmmTag: 1.17.0
   client:
     resources:
       requests:
         cpu: 50m
         memory: 128Mi
-      limits:
-        cpu: 200m
-        memory: 256Mi
+
   server:
     resources:
-      limits:
-        cpu: 500m
-        memory: 1Gi
+      # requests:
+      #   cpu: 500m
+      #   memory: 1Gi
+
     # PVC for pmm
     dataVolumeClaimAnnotations:
     dataVolumeClaimSpec:
-      # storageClassName: "pd-ssd"
+      # storageClassName: pd-ssd
       accessModes: ["ReadWriteOnce"]
       resources:
         requests:
-          storage: "10Gi"
+          storage: 10Gi
     env:
       # DISABLE_TELEMETRY
       # With telemetry enabled, your PMM Server sends some statistics to v.percona.com every 24 hours
@@ -283,9 +330,9 @@ pmm:
 # Default values for orchestrator resources
 orchestrator:
   enabled: false
-  image: "vitess/orchestrator:3.0.13"
+  image: vitess/orchestrator:3.0.13
   replicas: 3
   resources:
     requests:
-      cpu: "100m"
-      memory: "64Mi"
+      cpu: 50m
+      memory: 350Mi
diff --git a/java/grpc-client/src/main/java/io/vitess/client/grpc/GrpcClient.java b/java/grpc-client/src/main/java/io/vitess/client/grpc/GrpcClient.java
index 9927068b9e1..feb50bcdeca 100644
--- a/java/grpc-client/src/main/java/io/vitess/client/grpc/GrpcClient.java
+++ b/java/grpc-client/src/main/java/io/vitess/client/grpc/GrpcClient.java
@@ -20,9 +20,10 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import io.grpc.CallCredentials;
 import io.grpc.ManagedChannel;
 import io.grpc.StatusRuntimeException;
-import io.grpc.internal.WithLogId;
+import io.grpc.InternalWithLogId;
 import io.vitess.client.Context;
 import io.vitess.client.Proto;
 import io.vitess.client.RpcClient;
@@ -87,15 +88,23 @@ public class GrpcClient implements RpcClient {
 
   public GrpcClient(ManagedChannel channel) {
     this.channel = channel;
-    if (channel instanceof WithLogId) {
-      channelId = ((WithLogId) channel).getLogId().toString();
-    } else {
-      channelId = channel.toString();
-    }
+    channelId = toChannelId(channel);
     asyncStub = VitessGrpc.newStub(channel);
     futureStub = VitessGrpc.newFutureStub(channel);
   }
 
+  public GrpcClient(ManagedChannel channel, CallCredentials credentials) {
+    this.channel = channel;
+    channelId = toChannelId(channel);
+    asyncStub = VitessGrpc.newStub(channel).withCallCredentials(credentials);
+    futureStub = VitessGrpc.newFutureStub(channel).withCallCredentials(credentials);
+  }
+
+  private String toChannelId(ManagedChannel channel) {
+    return channel instanceof InternalWithLogId ?
+        ((InternalWithLogId) channel).getLogId().toString() : channel.toString();
+  }
+
   @Override
   public void close() throws IOException {
     channel.shutdown();
diff --git a/java/grpc-client/src/main/java/io/vitess/client/grpc/GrpcClientFactory.java b/java/grpc-client/src/main/java/io/vitess/client/grpc/GrpcClientFactory.java
index d042e855420..10b3ee63178 100644
--- a/java/grpc-client/src/main/java/io/vitess/client/grpc/GrpcClientFactory.java
+++ b/java/grpc-client/src/main/java/io/vitess/client/grpc/GrpcClientFactory.java
@@ -16,6 +16,9 @@
 
 package io.vitess.client.grpc;
 
+import io.grpc.CallCredentials;
+import io.grpc.LoadBalancer;
+import io.grpc.NameResolver;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -48,6 +51,9 @@
 public class GrpcClientFactory implements RpcClientFactory {
 
   private RetryingInterceptorConfig config;
+  private CallCredentials callCredentials;
+  private LoadBalancer.Factory loadBalancerFactory;
+  private NameResolver.Factory nameResolverFactory;
 
   public GrpcClientFactory() {
     this(RetryingInterceptorConfig.noOpConfig());
@@ -57,6 +63,21 @@ public GrpcClientFactory(RetryingInterceptorConfig config) {
     this.config = config;
   }
 
+  public GrpcClientFactory setCallCredentials(CallCredentials value) {
+    callCredentials = value;
+    return this;
+  }
+
+  public GrpcClientFactory setLoadBalancerFactory(LoadBalancer.Factory value) {
+    loadBalancerFactory = value;
+    return this;
+  }
+
+  public GrpcClientFactory setNameResolverFactory(NameResolver.Factory value) {
+    nameResolverFactory = value;
+    return this;
+  }
+
   /**
    * Factory method to construct a gRPC client connection with no transport-layer security.
    *
@@ -67,8 +88,17 @@ public GrpcClientFactory(RetryingInterceptorConfig config) {
    */
   @Override
   public RpcClient create(Context ctx, String target) {
-    return new GrpcClient(
-            NettyChannelBuilder.forTarget(target).negotiationType(NegotiationType.PLAINTEXT).intercept(new RetryingInterceptor(config)).build());
+    NettyChannelBuilder channel = NettyChannelBuilder.forTarget(target)
+        .negotiationType(NegotiationType.PLAINTEXT)
+        .intercept(new RetryingInterceptor(config));
+    if (loadBalancerFactory != null) {
+      channel.loadBalancerFactory(loadBalancerFactory);
+    }
+    if (nameResolverFactory != null) {
+      channel.nameResolverFactory(nameResolverFactory);
+    }
+    return callCredentials != null ?
+        new GrpcClient(channel.build(), callCredentials) : new GrpcClient(channel.build());
   }
 
   /**
diff --git a/java/grpc-client/src/main/java/io/vitess/client/grpc/StaticAuthCredentials.java b/java/grpc-client/src/main/java/io/vitess/client/grpc/StaticAuthCredentials.java
new file mode 100644
index 00000000000..fbf5694b8c9
--- /dev/null
+++ b/java/grpc-client/src/main/java/io/vitess/client/grpc/StaticAuthCredentials.java
@@ -0,0 +1,47 @@
+package io.vitess.client.grpc;
+
+import io.grpc.Attributes;
+import io.grpc.CallCredentials;
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+import io.grpc.Status;
+import java.util.Objects;
+import java.util.concurrent.Executor;
+
+/**
+ * {@link CallCredentials} that applies plain username and password.
+ */
+public class StaticAuthCredentials implements CallCredentials {
+
+  private static final Metadata.Key<String> USERNAME =
+      Metadata.Key.of("username", Metadata.ASCII_STRING_MARSHALLER);
+  private static final Metadata.Key<String> PASSWORD =
+      Metadata.Key.of("password", Metadata.ASCII_STRING_MARSHALLER);
+
+  private final String username;
+  private final String password;
+
+  public StaticAuthCredentials(String username, String password) {
+    this.username = Objects.requireNonNull(username);
+    this.password = Objects.requireNonNull(password);
+  }
+
+  @Override
+  public void applyRequestMetadata(MethodDescriptor<?, ?> method, Attributes attrs,
+      Executor executor, MetadataApplier applier) {
+    executor.execute(() -> {
+      try {
+        Metadata headers = new Metadata();
+        headers.put(USERNAME, username);
+        headers.put(PASSWORD, password);
+        applier.apply(headers);
+      } catch (Throwable e) {
+        applier.fail(Status.UNAUTHENTICATED.withCause(e));
+      }
+    });
+  }
+
+  @Override
+  public void thisUsesUnstableApi() {
+  }
+}
diff --git a/java/grpc-client/src/test/java/io/client/grpc/GrpcClientStaticAuthTest.java b/java/grpc-client/src/test/java/io/client/grpc/GrpcClientStaticAuthTest.java
new file mode 100644
index 00000000000..8be2567535c
--- /dev/null
+++ b/java/grpc-client/src/test/java/io/client/grpc/GrpcClientStaticAuthTest.java
@@ -0,0 +1,81 @@
+package io.client.grpc;
+
+import com.google.common.base.Throwables;
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
+import io.vitess.client.Context;
+import io.vitess.client.RpcClient;
+import io.vitess.client.RpcClientTest;
+import io.vitess.client.grpc.GrpcClientFactory;
+import io.vitess.client.grpc.StaticAuthCredentials;
+import io.vitess.proto.Vtgate.GetSrvKeyspaceRequest;
+import java.net.ServerSocket;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.concurrent.ExecutionException;
+import org.joda.time.Duration;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class GrpcClientStaticAuthTest extends RpcClientTest {
+  private static Process vtgateclienttest;
+  private static int port;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    String vtRoot = System.getenv("VTROOT");
+    if (vtRoot == null) {
+      throw new RuntimeException("cannot find env variable VTROOT; make sure to source dev.env");
+    }
+    URI staticAuthFile = GrpcClientStaticAuthTest.class.getResource("grpc_static_auth.json").toURI();
+
+    ServerSocket socket = new ServerSocket(0);
+    port = socket.getLocalPort();
+    socket.close();
+
+    vtgateclienttest = new ProcessBuilder(Arrays.asList(
+        vtRoot + "/bin/vtgateclienttest",
+        "-logtostderr",
+        "-grpc_port", Integer.toString(port),
+        "-service_map", "grpc-vtgateservice",
+        "-grpc_auth_mode", "static",
+        "-grpc_auth_static_password_file", staticAuthFile.getPath()
+    )).inheritIO().start();
+
+    Context ctx = Context.getDefault().withDeadlineAfter(Duration.millis(5000L));
+    client = new GrpcClientFactory()
+        .setCallCredentials(new StaticAuthCredentials("test-username", "test-password"))
+        .create(ctx, "localhost:" + port);
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    if (client != null) {
+      client.close();
+    }
+    if (vtgateclienttest != null) {
+      vtgateclienttest.destroy();
+      vtgateclienttest.waitFor();
+    }
+  }
+
+  @Test
+  public void testWrongPassword() throws Exception {
+    RpcClient client = new GrpcClientFactory()
+        .setCallCredentials(new StaticAuthCredentials("test-username", "WRONG-password"))
+        .create(Context.getDefault(), "localhost:" + port);
+    try {
+      client.getSrvKeyspace(Context.getDefault(), GetSrvKeyspaceRequest.getDefaultInstance()).get();
+      Assert.fail();
+    } catch (ExecutionException e) {
+      StatusRuntimeException cause = (StatusRuntimeException) Throwables.getRootCause(e);
+      Assert.assertSame(cause.getStatus().getCode(), Status.Code.PERMISSION_DENIED);
+    }
+    client.close();
+  }
+}
diff --git a/java/grpc-client/src/test/resources/io/client/grpc/grpc_static_auth.json b/java/grpc-client/src/test/resources/io/client/grpc/grpc_static_auth.json
new file mode 100644
index 00000000000..3d9941c5d33
--- /dev/null
+++ b/java/grpc-client/src/test/resources/io/client/grpc/grpc_static_auth.json
@@ -0,0 +1,6 @@
+[
+  {
+    "username": "test-username",
+    "password": "test-password"
+  }
+]
diff --git a/java/pom.xml b/java/pom.xml
index f253f5b773c..392b5c557dc 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -60,9 +60,9 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- Define versions which are also used by grpc-client/pom.xml. -->
-    <grpc.version>1.15.0</grpc.version>
-    <protobuf.java.version>3.5.1</protobuf.java.version>
-    <protobuf.protoc.version>3.5.1-1</protobuf.protoc.version>
+    <grpc.version>1.16.0</grpc.version>
+    <protobuf.java.version>3.6.1</protobuf.java.version>
+    <protobuf.protoc.version>3.6.1</protobuf.protoc.version>
   </properties>
 
   <!-- Add new dependencies here and then add it below or in your module. -->
diff --git a/test/mysql_flavor.py b/test/mysql_flavor.py
index dc14073a06e..56fb9495055 100644
--- a/test/mysql_flavor.py
+++ b/test/mysql_flavor.py
@@ -130,6 +130,12 @@ def change_master_commands(self, host, port, pos):
         (host, port)]
 
 
+class MariaDB103(MariaDB):
+  """Overrides specific to MariaDB 10.3+."""
+
+  def extra_my_cnf(self):
+    return environment.vttop + "/config/mycnf/master_mariadb103.cnf"
+
 class MySQL56(MysqlFlavor):
   """Overrides specific to MySQL 5.6."""
 
@@ -230,5 +236,5 @@ def register_flavor(flavor, cls, env):
   flavor_map[flavor] = {"cls": cls, "env": env}
 
 register_flavor("MariaDB", MariaDB, "MariaDB")
-register_flavor("MariaDB103", MariaDB, "MariaDB103")
+register_flavor("MariaDB103", MariaDB103, "MariaDB103")
 register_flavor("MySQL56", MySQL56, "MySQL56")
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 0874880cda7..cd518cfd8a4 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -397,44 +397,44 @@
 			"revisionTime": "2016-01-21T18:51:14Z"
 		},
 		{
-			"checksumSHA1": "NPefLsS2pv0+YlXAuJJvkNOMgyE=",
+			"checksumSHA1": "BP2buXHHOKxI5eYS2xELVng2kf4=",
 			"path": "github.com/golang/protobuf/jsonpb",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
-			"checksumSHA1": "JQZYNriPdhD2T55ConfFY4YobAI=",
+			"checksumSHA1": "3QpmjZApyomODlDRgXomf4DgsJU=",
 			"path": "github.com/golang/protobuf/jsonpb/jsonpb_test_proto",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
-			"checksumSHA1": "Pyou8mceOASSFxc7GeXZuVdSMi0=",
+			"checksumSHA1": "mE9XW26JSpe4meBObM6J/Oeq0eg=",
 			"path": "github.com/golang/protobuf/proto",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
-			"checksumSHA1": "3xnSTRvdw0riK30pmoCDK5ZzUVo=",
+			"checksumSHA1": "DlygQR0Ml7JuGquUo2U4C0MJLBs=",
 			"path": "github.com/golang/protobuf/proto/proto3_proto",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
-			"checksumSHA1": "9wt15/5CsuS7kuuLu/nBWLsCLGI=",
+			"checksumSHA1": "jI4LkaFUi2rO9vZwvIJJ9tCY6mM=",
 			"path": "github.com/golang/protobuf/proto/test_proto",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
 			"checksumSHA1": "A0DxiyxXV4u8PmwUwlVkQ2CKyiQ=",
@@ -445,50 +445,50 @@
 		{
 			"checksumSHA1": "iqWBA0GWNr+cwAdF2KVy1eq9mlU=",
 			"path": "github.com/golang/protobuf/protoc-gen-go",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
 			"checksumSHA1": "DA2cyOt1W92RTyXAqKQ4JWKGR8U=",
 			"path": "github.com/golang/protobuf/protoc-gen-go/descriptor",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
-			"checksumSHA1": "DifSE44TpfgLs4XBFJHiPy1YBoM=",
+			"checksumSHA1": "+BH6O73wJlqOQtPGpmnT+5l3tAw=",
 			"path": "github.com/golang/protobuf/protoc-gen-go/generator",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
 			"checksumSHA1": "uY4dEtqaAe5gsU8gbpCI1JgEIII=",
 			"path": "github.com/golang/protobuf/protoc-gen-go/generator/internal/remap",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
-			"checksumSHA1": "B4jGXkbpMIOBsp84RC3uwpufjDc=",
+			"checksumSHA1": "EGcFhhLBcZ2f7hTDhtkuK6q1MUc=",
 			"path": "github.com/golang/protobuf/protoc-gen-go/grpc",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
 			"checksumSHA1": "h4PLbJDYnRmcUuf56USJ5K3xJOg=",
 			"path": "github.com/golang/protobuf/protoc-gen-go/plugin",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
 			"checksumSHA1": "/vLtyN6HK5twSZIFerD199YTmjk=",
@@ -497,52 +497,52 @@
 			"revisionTime": "2016-11-03T22:44:32Z"
 		},
 		{
-			"checksumSHA1": "/s0InJhSrxhTpqw5FIKgSMknCfM=",
+			"checksumSHA1": "tkJPssYejSjuAwE2tdEnoEIj93Q=",
 			"path": "github.com/golang/protobuf/ptypes",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
-			"checksumSHA1": "3eqU9o+NMZSLM/coY5WDq7C1uKg=",
+			"checksumSHA1": "G0aiY+KmzFsQLTNzRAGRhJNSj7A=",
 			"path": "github.com/golang/protobuf/ptypes/any",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
-			"checksumSHA1": "ZIF0rnVzNLluFPqUebtJrVonMr4=",
+			"checksumSHA1": "kjVDCbK5/WiHqP1g4GMUxm75jos=",
 			"path": "github.com/golang/protobuf/ptypes/duration",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
-			"checksumSHA1": "QwgMLtaLi/6xHaNiDFwHN844AkI=",
+			"checksumSHA1": "VCwyXqpYo81QNvC7z6nsp+yczc4=",
 			"path": "github.com/golang/protobuf/ptypes/struct",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
-			"checksumSHA1": "1FJvuT0UllZaaS43kmPlx8oNiCs=",
+			"checksumSHA1": "FdeygjOuyR2p5v9b0kNOtzfpjS4=",
 			"path": "github.com/golang/protobuf/ptypes/timestamp",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
-			"checksumSHA1": "fs7UwFcU+SkJKA3eHcdhGsO4jrI=",
+			"checksumSHA1": "7sWfJ35gaddpCbcKYZRG2nL6eQo=",
 			"path": "github.com/golang/protobuf/ptypes/wrappers",
-			"revision": "b4deda0973fb4c70b50d226b1af49f3da59f5265",
-			"revisionTime": "2018-04-30T18:52:41Z",
-			"version": "v1.1.0",
-			"versionExact": "v1.1.0"
+			"revision": "aa810b61a9c79d51363740d207bb46cf8e620ed5",
+			"revisionTime": "2018-08-14T21:14:27Z",
+			"version": "v1.2.0",
+			"versionExact": "v1.2.0"
 		},
 		{
 			"checksumSHA1": "p/8vSviYF91gFflhrt5vkyksroo=",
@@ -593,12 +593,12 @@
 			"revisionTime": "2016-11-28T00:20:07Z"
 		},
 		{
-			"checksumSHA1": "ivSpuvm7dkBBC1kWyDWTZ9yF3Rs=",
+			"checksumSHA1": "LQOVduohnld12Px2o0MfYDPI7oQ=",
 			"path": "github.com/hashicorp/consul/api",
-			"revision": "9a494b5fb9c86180a5702e29c485df1507a47198",
-			"revisionTime": "2018-02-09T18:00:27Z",
-			"version": "v1.0.6",
-			"versionExact": "v1.0.6"
+			"revision": "0bddfa23a2ebe3c0773d917fc104f53d74f7a5ec",
+			"revisionTime": "2018-11-14T22:37:47Z",
+			"version": "v1.4.0",
+			"versionExact": "v1.4.0"
 		},
 		{
 			"checksumSHA1": "Uzyon2091lmwacNsl1hCytjhHtg=",
@@ -694,6 +694,12 @@
 			"revision": "b8bc1bf767474819792c23f32d8286a45736f1c6",
 			"revisionTime": "2016-12-03T19:45:07Z"
 		},
+		{
+			"checksumSHA1": "J+g0oZePWp2zSIISD2dZZKTxmgg=",
+			"path": "github.com/mitchellh/mapstructure",
+			"revision": "3536a929edddb9a5b34bd6861dc4a9647cb459fe",
+			"revisionTime": "2018-10-05T04:51:35Z"
+		},
 		{
 			"checksumSHA1": "txj5yUDiaSATtBLDlT0f6uaiIP8=",
 			"path": "github.com/olekukonko/tablewriter",
@@ -881,10 +887,10 @@
 			"revisionTime": "2016-03-18T12:12:46Z"
 		},
 		{
-			"checksumSHA1": "9jjO5GjLa0XF/nfWihF02RoH4qc=",
+			"checksumSHA1": "GtamqiJoL7PGHsN454AoffBFMa8=",
 			"path": "golang.org/x/net/context",
-			"revision": "3f122ce3dbbe488b7e6a8bdb26f41edec852a40b",
-			"revisionTime": "2016-06-09T04:57:12Z"
+			"revision": "adae6a3d119ae4890b46832a2e88a95adc62b8e7",
+			"revisionTime": "2018-11-14T21:44:15Z"
 		},
 		{
 			"checksumSHA1": "EJMLw8rk55bsqmIpSMtVORJpSGo=",
@@ -893,28 +899,34 @@
 			"revisionTime": "2016-04-12T22:48:50Z"
 		},
 		{
-			"checksumSHA1": "65kjHjv78wq9kBdZBRkAnjocGdc=",
+			"checksumSHA1": "pCY4YtdNKVBYRbNvODjx8hj0hIs=",
+			"path": "golang.org/x/net/http/httpguts",
+			"revision": "adae6a3d119ae4890b46832a2e88a95adc62b8e7",
+			"revisionTime": "2018-11-14T21:44:15Z"
+		},
+		{
+			"checksumSHA1": "QmfYRV9T2HIj1cvl2ZQCd6bXXKo=",
 			"path": "golang.org/x/net/http2",
-			"revision": "5f8847ae0d0e90b6a9dc8148e7ad616874625171",
-			"revisionTime": "2017-06-23T17:10:45Z"
+			"revision": "adae6a3d119ae4890b46832a2e88a95adc62b8e7",
+			"revisionTime": "2018-11-14T21:44:15Z"
 		},
 		{
-			"checksumSHA1": "ezWhc7n/FtqkLDQKeU2JbW+80tE=",
+			"checksumSHA1": "KZniwnfpWkaTPhUQDUTvgex/7y0=",
 			"path": "golang.org/x/net/http2/hpack",
-			"revision": "5f8847ae0d0e90b6a9dc8148e7ad616874625171",
-			"revisionTime": "2017-06-23T17:10:45Z"
+			"revision": "adae6a3d119ae4890b46832a2e88a95adc62b8e7",
+			"revisionTime": "2018-11-14T21:44:15Z"
 		},
 		{
-			"checksumSHA1": "VrzPJyWI6disCgYuVEQzkjqUsJk=",
+			"checksumSHA1": "RcrB7tgYS/GMW4QrwVdMOTNqIU8=",
 			"path": "golang.org/x/net/idna",
-			"revision": "5f8847ae0d0e90b6a9dc8148e7ad616874625171",
-			"revisionTime": "2017-06-23T17:10:45Z"
+			"revision": "adae6a3d119ae4890b46832a2e88a95adc62b8e7",
+			"revisionTime": "2018-11-14T21:44:15Z"
 		},
 		{
-			"checksumSHA1": "/k7k6eJDkxXx6K9Zpo/OwNm58XM=",
+			"checksumSHA1": "UxahDzW2v4mf/+aFxruuupaoIwo=",
 			"path": "golang.org/x/net/internal/timeseries",
-			"revision": "fb93926129b8ec0056f2f458b1f519654814edf0",
-			"revisionTime": "2016-04-12T22:48:50Z"
+			"revision": "adae6a3d119ae4890b46832a2e88a95adc62b8e7",
+			"revisionTime": "2018-11-14T21:44:15Z"
 		},
 		{
 			"checksumSHA1": "3xyuaSNmClqG4YWC7g0isQIbUTc=",
@@ -923,10 +935,10 @@
 			"revisionTime": "2017-06-23T17:10:45Z"
 		},
 		{
-			"checksumSHA1": "dZJWvQmmWOwDkGPxJqoE8rN005w=",
+			"checksumSHA1": "4vGl3N46SAJwQl/uSlQvZQvc734=",
 			"path": "golang.org/x/net/trace",
-			"revision": "fb93926129b8ec0056f2f458b1f519654814edf0",
-			"revisionTime": "2016-04-12T22:48:50Z"
+			"revision": "adae6a3d119ae4890b46832a2e88a95adc62b8e7",
+			"revisionTime": "2018-11-14T21:44:15Z"
 		},
 		{
 			"checksumSHA1": "4q+J7KldqFG28gkuEdHTyHgNcz4=",
@@ -959,10 +971,10 @@
 			"revisionTime": "2016-07-30T22:43:56Z"
 		},
 		{
-			"checksumSHA1": "Tr5yx/ucT6KllmNwUIRQUweZhWI=",
+			"checksumSHA1": "QmmEQv1jLvjlVGPsWewqeNYNoyk=",
 			"path": "golang.org/x/sys/unix",
-			"revision": "ec83556a53fe16b65c452a104ea9d1e86a671852",
-			"revisionTime": "2018-11-19T19:44:06Z"
+			"revision": "62eef0e2fa9b2c385f7b2778e763486da6880d37",
+			"revisionTime": "2018-11-22T14:36:24Z"
 		},
 		{
 			"checksumSHA1": "Gwx30TD3lMSgskBCmXTDXbICPRQ=",
@@ -1013,22 +1025,22 @@
 			"revisionTime": "2017-03-23T10:04:54Z"
 		},
 		{
-			"checksumSHA1": "faFDXp++cLjLBlvsr+izZ+go1WU=",
+			"checksumSHA1": "CbpjEkkOeh0fdM/V8xKDdI0AA88=",
 			"path": "golang.org/x/text/secure/bidirule",
-			"revision": "4e9ab9ee170f2a39bd66c92b3e0a47ff47a4bc77",
-			"revisionTime": "2017-06-09T11:26:06Z"
+			"revision": "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2",
+			"revisionTime": "2018-10-29T18:00:05Z"
 		},
 		{
-			"checksumSHA1": "ziMb9+ANGRJSSIuxYdRbA+cDRBQ=",
+			"checksumSHA1": "o3YChxWLvyCmkAn/ZNBj9HC9zKw=",
 			"path": "golang.org/x/text/transform",
-			"revision": "fc7fa097411d30e6708badff276c4c164425590c",
-			"revisionTime": "2017-03-23T10:04:54Z"
+			"revision": "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2",
+			"revisionTime": "2018-10-29T18:00:05Z"
 		},
 		{
-			"checksumSHA1": "MRLtTu/vpd18le8/HPLxOdjO5RE=",
+			"checksumSHA1": "qjFbU4RWY+Caxaa5/TlMJW82E+A=",
 			"path": "golang.org/x/text/unicode/bidi",
-			"revision": "4e9ab9ee170f2a39bd66c92b3e0a47ff47a4bc77",
-			"revisionTime": "2017-06-09T11:26:06Z"
+			"revision": "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2",
+			"revisionTime": "2018-10-29T18:00:05Z"
 		},
 		{
 			"checksumSHA1": "+U+vu5UQXoIB4egXy7uX3GYBxVo=",
@@ -1037,10 +1049,10 @@
 			"revisionTime": "2017-03-23T10:04:54Z"
 		},
 		{
-			"checksumSHA1": "cCdfq19OZBMVpK2zs73XdGpi1SU=",
+			"checksumSHA1": "vAScJLvb0ucuuclyN9vmJUyWTBA=",
 			"path": "golang.org/x/text/unicode/norm",
-			"revision": "fc7fa097411d30e6708badff276c4c164425590c",
-			"revisionTime": "2017-03-23T10:04:54Z"
+			"revision": "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2",
+			"revisionTime": "2018-10-29T18:00:05Z"
 		},
 		{
 			"checksumSHA1": "bLoGyjxHeYpHKEzU1g9f3m5qsnQ=",
@@ -1115,66 +1127,66 @@
 			"revisionTime": "2016-12-12T20:09:13Z"
 		},
 		{
-			"checksumSHA1": "AvVpgwhxhJgjoSledwDtYrEKVE4=",
+			"checksumSHA1": "MgYFT27I9gfAtSVBpGVqkCYOj3U=",
 			"path": "google.golang.org/genproto/googleapis/rpc/status",
-			"revision": "aa2eb687b4d3e17154372564ad8d6bf11c3cf21f",
-			"revisionTime": "2017-05-31T20:35:52Z"
+			"revision": "b5d43981345bdb2c233eb4bf3277847b48c6fdc6",
+			"revisionTime": "2018-11-09T15:42:31Z"
 		},
 		{
-			"checksumSHA1": "qniZg+TMtxqdBOxLukGnd5fBsmc=",
+			"checksumSHA1": "O6SQTcVdhL+4betKp/7ketCc/AU=",
 			"path": "google.golang.org/grpc",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
-			"checksumSHA1": "B+kZFVP8zRiQMpoEb39Mp2oSmqg=",
+			"checksumSHA1": "9KEKKMRAdFnz2sMBXbb33ZLS8Oo=",
 			"path": "google.golang.org/grpc/balancer",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "lw+L836hLeH8+//le+C+ycddCCU=",
 			"path": "google.golang.org/grpc/balancer/base",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "DJ1AtOk4Pu7bqtUMob95Hw8HPNw=",
 			"path": "google.golang.org/grpc/balancer/roundrobin",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "R3tuACGAPyK4lr+oSNt1saUzC0M=",
 			"path": "google.golang.org/grpc/codes",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "XH2WYcDNwVO47zYShREJjcYXm0Y=",
 			"path": "google.golang.org/grpc/connectivity",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
-			"checksumSHA1": "wA6y5rkH1v4bWBe5M1r/Hdtgma4=",
+			"checksumSHA1": "5r6NIQY1c3NjwLtxUOo/BcUOqFo=",
 			"path": "google.golang.org/grpc/credentials",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "QbufP1o0bXrtd5XecqdRCK/Vl0M=",
@@ -1187,34 +1199,34 @@
 		{
 			"checksumSHA1": "cfLb+pzWB+Glwp82rgfcEST1mv8=",
 			"path": "google.golang.org/grpc/encoding",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "LKKkn7EYA+Do9Qwb2/SUKLFNxoo=",
 			"path": "google.golang.org/grpc/encoding/proto",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "H7SuPUqbPcdbNqgl+k3ohuwMAwE=",
 			"path": "google.golang.org/grpc/grpclb/grpc_lb_v1/messages",
 			"revision": "d89cded64628466c4ab532d1f0ba5c220459ebe8",
 			"revisionTime": "2018-04-04T21:41:50Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "ZPPSFisPDz2ANO4FBZIft+fRxyk=",
 			"path": "google.golang.org/grpc/grpclog",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "QyasSHZlgle+PHSIQ2/p+fr+ihY=",
@@ -1225,140 +1237,140 @@
 			"versionExact": "v1.11.2"
 		},
 		{
-			"checksumSHA1": "8uLpHZuwD6Ug/QlvN94QyHaOack=",
+			"checksumSHA1": "LVvnj/+AVrdZMDw0DZ8D/vI24+M=",
 			"path": "google.golang.org/grpc/internal",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "uDJA7QK2iGnEwbd9TPqkLaM+xuU=",
 			"path": "google.golang.org/grpc/internal/backoff",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
-			"checksumSHA1": "8dcRbrJWAcFQIXVuchR6z4ItIzg=",
+			"checksumSHA1": "V6eyqZJfYh+cX+I/AxPVjkQLjTM=",
 			"path": "google.golang.org/grpc/internal/channelz",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "5dFUCEaPjKwza9kwKqgljp8ckU4=",
 			"path": "google.golang.org/grpc/internal/envconfig",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "70gndc/uHwyAl3D45zqp7vyHWlo=",
 			"path": "google.golang.org/grpc/internal/grpcrand",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
-			"checksumSHA1": "3/+ZIaJhkKSSqt6Z3VDS0Q8zMXA=",
+			"checksumSHA1": "0r7S4jTgUIatKqL/8ra0J7Q5iO0=",
 			"path": "google.golang.org/grpc/internal/transport",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
-			"checksumSHA1": "hcuHgKp8W0wIzoCnNfKI8NUss5o=",
+			"checksumSHA1": "350+v+N+AuknxomqjND19nR969g=",
 			"path": "google.golang.org/grpc/keepalive",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "OjIAi5AzqlQ7kLtdAyjvdgMf6hc=",
 			"path": "google.golang.org/grpc/metadata",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "VvGBoawND0urmYDy11FT+U1IHtU=",
 			"path": "google.golang.org/grpc/naming",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "n5EgDdBqFMa2KQFhtl+FF/4gIFo=",
 			"path": "google.golang.org/grpc/peer",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "GEq6wwE1qWLmkaM02SjxBmmnHDo=",
 			"path": "google.golang.org/grpc/resolver",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
-			"checksumSHA1": "90rwIeFK1zLW8M57MfzmejpCwP4=",
+			"checksumSHA1": "grHAHa6Fi3WBsXJpmlEOlRbWWVg=",
 			"path": "google.golang.org/grpc/resolver/dns",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "zs9M4xE8Lyg4wvuYvR00XoBxmuw=",
 			"path": "google.golang.org/grpc/resolver/passthrough",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "YclPgme2gT3S0hTkHVdE1zAxJdo=",
 			"path": "google.golang.org/grpc/stats",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
-			"checksumSHA1": "t/NhHuykWsxY0gEBd2WIv5RVBK8=",
+			"checksumSHA1": "hFyBO5vgsMamKhUOSyPCqROk1vo=",
 			"path": "google.golang.org/grpc/status",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "qvArRhlrww5WvRmbyMF2mUfbJew=",
 			"path": "google.golang.org/grpc/tap",
-			"revision": "8dea3dc473e90c8179e519d91302d0597c0ca1d1",
-			"revisionTime": "2018-09-11T17:48:51Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"revision": "2e463a05d100327ca47ac218281906921038fd95",
+			"revisionTime": "2018-10-23T17:37:47Z",
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "sg7RY87LaWXaZMj0cuLQQaJJQYo=",
 			"path": "google.golang.org/grpc/transport",
 			"revision": "d89cded64628466c4ab532d1f0ba5c220459ebe8",
 			"revisionTime": "2018-04-04T21:41:50Z",
-			"version": "v1.15.0",
-			"versionExact": "v1.15.0"
+			"version": "v1.16.0",
+			"versionExact": "v1.16.0"
 		},
 		{
 			"checksumSHA1": "wSu8owMAP7GixsYoSZ4CmKUVhnU=",