diff --git a/pkg/kubelet/api/v1alpha1/runtime/api.pb.go b/pkg/kubelet/api/v1alpha1/runtime/api.pb.go
index 4a844f5b17e..a308870ceab 100644
--- a/pkg/kubelet/api/v1alpha1/runtime/api.pb.go
+++ b/pkg/kubelet/api/v1alpha1/runtime/api.pb.go
@@ -104,6 +104,10 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+const _ = proto.GoGoProtoPackageIsVersion1
+
 type Protocol int32
 
 const (
@@ -136,6 +140,7 @@ func (x *Protocol) UnmarshalJSON(data []byte) error {
 	*x = Protocol(value)
 	return nil
 }
+func (Protocol) EnumDescriptor() ([]byte, []int) { return fileDescriptorApi, []int{0} }
 
 type PodSandBoxState int32
 
@@ -169,6 +174,7 @@ func (x *PodSandBoxState) UnmarshalJSON(data []byte) error {
 	*x = PodSandBoxState(value)
 	return nil
 }
+func (PodSandBoxState) EnumDescriptor() ([]byte, []int) { return fileDescriptorApi, []int{1} }
 
 type ContainerState int32
 
@@ -208,6 +214,7 @@ func (x *ContainerState) UnmarshalJSON(data []byte) error {
 	*x = ContainerState(value)
 	return nil
 }
+func (ContainerState) EnumDescriptor() ([]byte, []int) { return fileDescriptorApi, []int{2} }
 
 type VersionRequest struct {
 	// The version of kubelet runtime API.
@@ -215,9 +222,10 @@ type VersionRequest struct {
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *VersionRequest) Reset()         { *m = VersionRequest{} }
-func (m *VersionRequest) String() string { return proto.CompactTextString(m) }
-func (*VersionRequest) ProtoMessage()    {}
+func (m *VersionRequest) Reset()                    { *m = VersionRequest{} }
+func (m *VersionRequest) String() string            { return proto.CompactTextString(m) }
+func (*VersionRequest) ProtoMessage()               {}
+func (*VersionRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{0} }
 
 func (m *VersionRequest) GetVersion() string {
 	if m != nil && m.Version != nil {
@@ -230,17 +238,18 @@ type VersionResponse struct {
 	// The version of the kubelet runtime API.
 	Version *string `protobuf:"bytes,1,opt,name=version" json:"version,omitempty"`
 	// The name of the container runtime.
-	RuntimeName *string `protobuf:"bytes,2,opt,name=runtime_name" json:"runtime_name,omitempty"`
+	RuntimeName *string `protobuf:"bytes,2,opt,name=runtime_name,json=runtimeName" json:"runtime_name,omitempty"`
 	// The version of the container runtime.
-	RuntimeVersion *string `protobuf:"bytes,3,opt,name=runtime_version" json:"runtime_version,omitempty"`
+	RuntimeVersion *string `protobuf:"bytes,3,opt,name=runtime_version,json=runtimeVersion" json:"runtime_version,omitempty"`
 	// The API version of the container runtime.
-	RuntimeApiVersion *string `protobuf:"bytes,4,opt,name=runtime_api_version" json:"runtime_api_version,omitempty"`
+	RuntimeApiVersion *string `protobuf:"bytes,4,opt,name=runtime_api_version,json=runtimeApiVersion" json:"runtime_api_version,omitempty"`
 	XXX_unrecognized  []byte  `json:"-"`
 }
 
-func (m *VersionResponse) Reset()         { *m = VersionResponse{} }
-func (m *VersionResponse) String() string { return proto.CompactTextString(m) }
-func (*VersionResponse) ProtoMessage()    {}
+func (m *VersionResponse) Reset()                    { *m = VersionResponse{} }
+func (m *VersionResponse) String() string            { return proto.CompactTextString(m) }
+func (*VersionResponse) ProtoMessage()               {}
+func (*VersionResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{1} }
 
 func (m *VersionResponse) GetVersion() string {
 	if m != nil && m.Version != nil {
@@ -279,9 +288,10 @@ type DNSOption struct {
 	XXX_unrecognized []byte   `json:"-"`
 }
 
-func (m *DNSOption) Reset()         { *m = DNSOption{} }
-func (m *DNSOption) String() string { return proto.CompactTextString(m) }
-func (*DNSOption) ProtoMessage()    {}
+func (m *DNSOption) Reset()                    { *m = DNSOption{} }
+func (m *DNSOption) String() string            { return proto.CompactTextString(m) }
+func (*DNSOption) ProtoMessage()               {}
+func (*DNSOption) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{2} }
 
 func (m *DNSOption) GetServers() []string {
 	if m != nil {
@@ -304,17 +314,18 @@ type PortMapping struct {
 	// The protocol of the port mapping.
 	Protocol *Protocol `protobuf:"varint,2,opt,name=protocol,enum=runtime.Protocol" json:"protocol,omitempty"`
 	// The port number within the container.
-	ContainerPort *int32 `protobuf:"varint,3,opt,name=container_port" json:"container_port,omitempty"`
+	ContainerPort *int32 `protobuf:"varint,3,opt,name=container_port,json=containerPort" json:"container_port,omitempty"`
 	// The port number on the host.
-	HostPort *int32 `protobuf:"varint,4,opt,name=host_port" json:"host_port,omitempty"`
+	HostPort *int32 `protobuf:"varint,4,opt,name=host_port,json=hostPort" json:"host_port,omitempty"`
 	// The host IP.
-	HostIp           *string `protobuf:"bytes,5,opt,name=host_ip" json:"host_ip,omitempty"`
+	HostIp           *string `protobuf:"bytes,5,opt,name=host_ip,json=hostIp" json:"host_ip,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *PortMapping) Reset()         { *m = PortMapping{} }
-func (m *PortMapping) String() string { return proto.CompactTextString(m) }
-func (*PortMapping) ProtoMessage()    {}
+func (m *PortMapping) Reset()                    { *m = PortMapping{} }
+func (m *PortMapping) String() string            { return proto.CompactTextString(m) }
+func (*PortMapping) ProtoMessage()               {}
+func (*PortMapping) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{3} }
 
 func (m *PortMapping) GetName() string {
 	if m != nil && m.Name != nil {
@@ -356,19 +367,20 @@ type Mount struct {
 	// The name of the volume mount.
 	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 	// The path of the mount within the container.
-	ContainerPath *string `protobuf:"bytes,2,opt,name=container_path" json:"container_path,omitempty"`
+	ContainerPath *string `protobuf:"bytes,2,opt,name=container_path,json=containerPath" json:"container_path,omitempty"`
 	// The path of the mount on the host.
-	HostPath *string `protobuf:"bytes,3,opt,name=host_path" json:"host_path,omitempty"`
+	HostPath *string `protobuf:"bytes,3,opt,name=host_path,json=hostPath" json:"host_path,omitempty"`
 	// If set, the mount is read-only.
 	Readonly *bool `protobuf:"varint,4,opt,name=readonly" json:"readonly,omitempty"`
 	// If set, the mount needs SELinux relabeling
-	SelinuxRelabel   *bool  `protobuf:"varint,5,opt,name=selinux_relabel" json:"selinux_relabel,omitempty"`
+	SelinuxRelabel   *bool  `protobuf:"varint,5,opt,name=selinux_relabel,json=selinuxRelabel" json:"selinux_relabel,omitempty"`
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *Mount) Reset()         { *m = Mount{} }
-func (m *Mount) String() string { return proto.CompactTextString(m) }
-func (*Mount) ProtoMessage()    {}
+func (m *Mount) Reset()                    { *m = Mount{} }
+func (m *Mount) String() string            { return proto.CompactTextString(m) }
+func (*Mount) ProtoMessage()               {}
+func (*Mount) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{4} }
 
 func (m *Mount) GetName() string {
 	if m != nil && m.Name != nil {
@@ -418,9 +430,10 @@ type ResourceRequirements struct {
 	XXX_unrecognized []byte   `json:"-"`
 }
 
-func (m *ResourceRequirements) Reset()         { *m = ResourceRequirements{} }
-func (m *ResourceRequirements) String() string { return proto.CompactTextString(m) }
-func (*ResourceRequirements) ProtoMessage()    {}
+func (m *ResourceRequirements) Reset()                    { *m = ResourceRequirements{} }
+func (m *ResourceRequirements) String() string            { return proto.CompactTextString(m) }
+func (*ResourceRequirements) ProtoMessage()               {}
+func (*ResourceRequirements) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{5} }
 
 func (m *ResourceRequirements) GetLimits() float64 {
 	if m != nil && m.Limits != nil {
@@ -445,9 +458,10 @@ type PodSandboxResources struct {
 	XXX_unrecognized []byte                `json:"-"`
 }
 
-func (m *PodSandboxResources) Reset()         { *m = PodSandboxResources{} }
-func (m *PodSandboxResources) String() string { return proto.CompactTextString(m) }
-func (*PodSandboxResources) ProtoMessage()    {}
+func (m *PodSandboxResources) Reset()                    { *m = PodSandboxResources{} }
+func (m *PodSandboxResources) String() string            { return proto.CompactTextString(m) }
+func (*PodSandboxResources) ProtoMessage()               {}
+func (*PodSandboxResources) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{6} }
 
 func (m *PodSandboxResources) GetCpu() *ResourceRequirements {
 	if m != nil {
@@ -466,17 +480,18 @@ func (m *PodSandboxResources) GetMemory() *ResourceRequirements {
 // NamespaceOption provides options for Linux namespaces.
 type NamespaceOption struct {
 	// If set, use the host's network namespace.
-	HostNetwork *bool `protobuf:"varint,1,opt,name=host_network" json:"host_network,omitempty"`
+	HostNetwork *bool `protobuf:"varint,1,opt,name=host_network,json=hostNetwork" json:"host_network,omitempty"`
 	// If set, use the host's pid namesapce.
-	HostPid *bool `protobuf:"varint,2,opt,name=host_pid" json:"host_pid,omitempty"`
+	HostPid *bool `protobuf:"varint,2,opt,name=host_pid,json=hostPid" json:"host_pid,omitempty"`
 	// If set, use the host's ipc namespace.
-	HostIpc          *bool  `protobuf:"varint,3,opt,name=host_ipc" json:"host_ipc,omitempty"`
+	HostIpc          *bool  `protobuf:"varint,3,opt,name=host_ipc,json=hostIpc" json:"host_ipc,omitempty"`
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *NamespaceOption) Reset()         { *m = NamespaceOption{} }
-func (m *NamespaceOption) String() string { return proto.CompactTextString(m) }
-func (*NamespaceOption) ProtoMessage()    {}
+func (m *NamespaceOption) Reset()                    { *m = NamespaceOption{} }
+func (m *NamespaceOption) String() string            { return proto.CompactTextString(m) }
+func (*NamespaceOption) ProtoMessage()               {}
+func (*NamespaceOption) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{7} }
 
 func (m *NamespaceOption) GetHostNetwork() bool {
 	if m != nil && m.HostNetwork != nil {
@@ -505,16 +520,17 @@ type LinuxPodSandboxConfig struct {
 	// The parent cgroup of the pod sandbox.
 	// The cgroupfs style syntax will be used, but the container runtime can
 	// convert it to systemd semantices if needed.
-	CgroupParent *string `protobuf:"bytes,1,opt,name=cgroup_parent" json:"cgroup_parent,omitempty"`
+	CgroupParent *string `protobuf:"bytes,1,opt,name=cgroup_parent,json=cgroupParent" json:"cgroup_parent,omitempty"`
 	// The configurations for the sandbox's namespaces.
 	// This will be used only if the PodSandbox uses namespace for isolation.
-	NamespaceOptions *NamespaceOption `protobuf:"bytes,2,opt,name=namespace_options" json:"namespace_options,omitempty"`
+	NamespaceOptions *NamespaceOption `protobuf:"bytes,2,opt,name=namespace_options,json=namespaceOptions" json:"namespace_options,omitempty"`
 	XXX_unrecognized []byte           `json:"-"`
 }
 
-func (m *LinuxPodSandboxConfig) Reset()         { *m = LinuxPodSandboxConfig{} }
-func (m *LinuxPodSandboxConfig) String() string { return proto.CompactTextString(m) }
-func (*LinuxPodSandboxConfig) ProtoMessage()    {}
+func (m *LinuxPodSandboxConfig) Reset()                    { *m = LinuxPodSandboxConfig{} }
+func (m *LinuxPodSandboxConfig) String() string            { return proto.CompactTextString(m) }
+func (*LinuxPodSandboxConfig) ProtoMessage()               {}
+func (*LinuxPodSandboxConfig) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{8} }
 
 func (m *LinuxPodSandboxConfig) GetCgroupParent() string {
 	if m != nil && m.CgroupParent != nil {
@@ -552,11 +568,11 @@ type PodSandboxConfig struct {
 	// container logs are under active discussion in
 	// https://issues.k8s.io/24677. There *may* be future change of direction
 	// for logging as the discussion carries on.
-	LogDirectory *string `protobuf:"bytes,3,opt,name=log_directory" json:"log_directory,omitempty"`
+	LogDirectory *string `protobuf:"bytes,3,opt,name=log_directory,json=logDirectory" json:"log_directory,omitempty"`
 	// The DNS options for the sandbox.
-	DnsOptions *DNSOption `protobuf:"bytes,4,opt,name=dns_options" json:"dns_options,omitempty"`
+	DnsOptions *DNSOption `protobuf:"bytes,4,opt,name=dns_options,json=dnsOptions" json:"dns_options,omitempty"`
 	// The port mappings for the sandbox.
-	PortMappings []*PortMapping `protobuf:"bytes,5,rep,name=port_mappings" json:"port_mappings,omitempty"`
+	PortMappings []*PortMapping `protobuf:"bytes,5,rep,name=port_mappings,json=portMappings" json:"port_mappings,omitempty"`
 	// Resources specifies the resource limits for the sandbox (i.e., the
 	// aggregate cpu/memory resources limits of all containers).
 	// Note: On a Linux host, kubelet will create a pod-level cgroup and pass
@@ -574,9 +590,10 @@ type PodSandboxConfig struct {
 	XXX_unrecognized []byte                 `json:"-"`
 }
 
-func (m *PodSandboxConfig) Reset()         { *m = PodSandboxConfig{} }
-func (m *PodSandboxConfig) String() string { return proto.CompactTextString(m) }
-func (*PodSandboxConfig) ProtoMessage()    {}
+func (m *PodSandboxConfig) Reset()                    { *m = PodSandboxConfig{} }
+func (m *PodSandboxConfig) String() string            { return proto.CompactTextString(m) }
+func (*PodSandboxConfig) ProtoMessage()               {}
+func (*PodSandboxConfig) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{9} }
 
 func (m *PodSandboxConfig) GetName() string {
 	if m != nil && m.Name != nil {
@@ -647,9 +664,10 @@ type CreatePodSandboxRequest struct {
 	XXX_unrecognized []byte            `json:"-"`
 }
 
-func (m *CreatePodSandboxRequest) Reset()         { *m = CreatePodSandboxRequest{} }
-func (m *CreatePodSandboxRequest) String() string { return proto.CompactTextString(m) }
-func (*CreatePodSandboxRequest) ProtoMessage()    {}
+func (m *CreatePodSandboxRequest) Reset()                    { *m = CreatePodSandboxRequest{} }
+func (m *CreatePodSandboxRequest) String() string            { return proto.CompactTextString(m) }
+func (*CreatePodSandboxRequest) ProtoMessage()               {}
+func (*CreatePodSandboxRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{10} }
 
 func (m *CreatePodSandboxRequest) GetConfig() *PodSandboxConfig {
 	if m != nil {
@@ -660,13 +678,14 @@ func (m *CreatePodSandboxRequest) GetConfig() *PodSandboxConfig {
 
 type CreatePodSandboxResponse struct {
 	// The id of the PodSandBox
-	PodSandboxId     *string `protobuf:"bytes,1,opt,name=pod_sandbox_id" json:"pod_sandbox_id,omitempty"`
+	PodSandboxId     *string `protobuf:"bytes,1,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *CreatePodSandboxResponse) Reset()         { *m = CreatePodSandboxResponse{} }
-func (m *CreatePodSandboxResponse) String() string { return proto.CompactTextString(m) }
-func (*CreatePodSandboxResponse) ProtoMessage()    {}
+func (m *CreatePodSandboxResponse) Reset()                    { *m = CreatePodSandboxResponse{} }
+func (m *CreatePodSandboxResponse) String() string            { return proto.CompactTextString(m) }
+func (*CreatePodSandboxResponse) ProtoMessage()               {}
+func (*CreatePodSandboxResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{11} }
 
 func (m *CreatePodSandboxResponse) GetPodSandboxId() string {
 	if m != nil && m.PodSandboxId != nil {
@@ -677,13 +696,14 @@ func (m *CreatePodSandboxResponse) GetPodSandboxId() string {
 
 type StopPodSandboxRequest struct {
 	// The id of the PodSandBox
-	PodSandboxId     *string `protobuf:"bytes,1,opt,name=pod_sandbox_id" json:"pod_sandbox_id,omitempty"`
+	PodSandboxId     *string `protobuf:"bytes,1,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *StopPodSandboxRequest) Reset()         { *m = StopPodSandboxRequest{} }
-func (m *StopPodSandboxRequest) String() string { return proto.CompactTextString(m) }
-func (*StopPodSandboxRequest) ProtoMessage()    {}
+func (m *StopPodSandboxRequest) Reset()                    { *m = StopPodSandboxRequest{} }
+func (m *StopPodSandboxRequest) String() string            { return proto.CompactTextString(m) }
+func (*StopPodSandboxRequest) ProtoMessage()               {}
+func (*StopPodSandboxRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{12} }
 
 func (m *StopPodSandboxRequest) GetPodSandboxId() string {
 	if m != nil && m.PodSandboxId != nil {
@@ -696,19 +716,21 @@ type StopPodSandboxResponse struct {
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *StopPodSandboxResponse) Reset()         { *m = StopPodSandboxResponse{} }
-func (m *StopPodSandboxResponse) String() string { return proto.CompactTextString(m) }
-func (*StopPodSandboxResponse) ProtoMessage()    {}
+func (m *StopPodSandboxResponse) Reset()                    { *m = StopPodSandboxResponse{} }
+func (m *StopPodSandboxResponse) String() string            { return proto.CompactTextString(m) }
+func (*StopPodSandboxResponse) ProtoMessage()               {}
+func (*StopPodSandboxResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{13} }
 
 type RemovePodSandboxRequest struct {
 	// The id of the PodSandBox
-	PodSandboxId     *string `protobuf:"bytes,1,opt,name=pod_sandbox_id" json:"pod_sandbox_id,omitempty"`
+	PodSandboxId     *string `protobuf:"bytes,1,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *RemovePodSandboxRequest) Reset()         { *m = RemovePodSandboxRequest{} }
-func (m *RemovePodSandboxRequest) String() string { return proto.CompactTextString(m) }
-func (*RemovePodSandboxRequest) ProtoMessage()    {}
+func (m *RemovePodSandboxRequest) Reset()                    { *m = RemovePodSandboxRequest{} }
+func (m *RemovePodSandboxRequest) String() string            { return proto.CompactTextString(m) }
+func (*RemovePodSandboxRequest) ProtoMessage()               {}
+func (*RemovePodSandboxRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{14} }
 
 func (m *RemovePodSandboxRequest) GetPodSandboxId() string {
 	if m != nil && m.PodSandboxId != nil {
@@ -721,19 +743,21 @@ type RemovePodSandboxResponse struct {
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *RemovePodSandboxResponse) Reset()         { *m = RemovePodSandboxResponse{} }
-func (m *RemovePodSandboxResponse) String() string { return proto.CompactTextString(m) }
-func (*RemovePodSandboxResponse) ProtoMessage()    {}
+func (m *RemovePodSandboxResponse) Reset()                    { *m = RemovePodSandboxResponse{} }
+func (m *RemovePodSandboxResponse) String() string            { return proto.CompactTextString(m) }
+func (*RemovePodSandboxResponse) ProtoMessage()               {}
+func (*RemovePodSandboxResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{15} }
 
 type PodSandboxStatusRequest struct {
 	// The id of the PodSandBox
-	PodSandboxId     *string `protobuf:"bytes,1,opt,name=pod_sandbox_id" json:"pod_sandbox_id,omitempty"`
+	PodSandboxId     *string `protobuf:"bytes,1,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *PodSandboxStatusRequest) Reset()         { *m = PodSandboxStatusRequest{} }
-func (m *PodSandboxStatusRequest) String() string { return proto.CompactTextString(m) }
-func (*PodSandboxStatusRequest) ProtoMessage()    {}
+func (m *PodSandboxStatusRequest) Reset()                    { *m = PodSandboxStatusRequest{} }
+func (m *PodSandboxStatusRequest) String() string            { return proto.CompactTextString(m) }
+func (*PodSandboxStatusRequest) ProtoMessage()               {}
+func (*PodSandboxStatusRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{16} }
 
 func (m *PodSandboxStatusRequest) GetPodSandboxId() string {
 	if m != nil && m.PodSandboxId != nil {
@@ -749,9 +773,10 @@ type PodSandboxNetworkStatus struct {
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *PodSandboxNetworkStatus) Reset()         { *m = PodSandboxNetworkStatus{} }
-func (m *PodSandboxNetworkStatus) String() string { return proto.CompactTextString(m) }
-func (*PodSandboxNetworkStatus) ProtoMessage()    {}
+func (m *PodSandboxNetworkStatus) Reset()                    { *m = PodSandboxNetworkStatus{} }
+func (m *PodSandboxNetworkStatus) String() string            { return proto.CompactTextString(m) }
+func (*PodSandboxNetworkStatus) ProtoMessage()               {}
+func (*PodSandboxNetworkStatus) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{17} }
 
 func (m *PodSandboxNetworkStatus) GetIp() string {
 	if m != nil && m.Ip != nil {
@@ -769,9 +794,10 @@ type Namespace struct {
 	XXX_unrecognized []byte           `json:"-"`
 }
 
-func (m *Namespace) Reset()         { *m = Namespace{} }
-func (m *Namespace) String() string { return proto.CompactTextString(m) }
-func (*Namespace) ProtoMessage()    {}
+func (m *Namespace) Reset()                    { *m = Namespace{} }
+func (m *Namespace) String() string            { return proto.CompactTextString(m) }
+func (*Namespace) ProtoMessage()               {}
+func (*Namespace) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{18} }
 
 func (m *Namespace) GetNetwork() string {
 	if m != nil && m.Network != nil {
@@ -794,9 +820,10 @@ type LinuxPodSandboxStatus struct {
 	XXX_unrecognized []byte     `json:"-"`
 }
 
-func (m *LinuxPodSandboxStatus) Reset()         { *m = LinuxPodSandboxStatus{} }
-func (m *LinuxPodSandboxStatus) String() string { return proto.CompactTextString(m) }
-func (*LinuxPodSandboxStatus) ProtoMessage()    {}
+func (m *LinuxPodSandboxStatus) Reset()                    { *m = LinuxPodSandboxStatus{} }
+func (m *LinuxPodSandboxStatus) String() string            { return proto.CompactTextString(m) }
+func (*LinuxPodSandboxStatus) ProtoMessage()               {}
+func (*LinuxPodSandboxStatus) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{19} }
 
 func (m *LinuxPodSandboxStatus) GetNamespaces() *Namespace {
 	if m != nil {
@@ -814,7 +841,7 @@ type PodSandboxStatus struct {
 	// State of the sandbox.
 	State *PodSandBoxState `protobuf:"varint,3,opt,name=state,enum=runtime.PodSandBoxState" json:"state,omitempty"`
 	// Creation timestamp of the sandbox
-	CreatedAt *int64 `protobuf:"varint,4,opt,name=created_at" json:"created_at,omitempty"`
+	CreatedAt *int64 `protobuf:"varint,4,opt,name=created_at,json=createdAt" json:"created_at,omitempty"`
 	// Network contains network status if network is handled by the runtime.
 	Network *PodSandboxNetworkStatus `protobuf:"bytes,5,opt,name=network" json:"network,omitempty"`
 	// Linux specific status to a pod sandbox.
@@ -827,9 +854,10 @@ type PodSandboxStatus struct {
 	XXX_unrecognized []byte            `json:"-"`
 }
 
-func (m *PodSandboxStatus) Reset()         { *m = PodSandboxStatus{} }
-func (m *PodSandboxStatus) String() string { return proto.CompactTextString(m) }
-func (*PodSandboxStatus) ProtoMessage()    {}
+func (m *PodSandboxStatus) Reset()                    { *m = PodSandboxStatus{} }
+func (m *PodSandboxStatus) String() string            { return proto.CompactTextString(m) }
+func (*PodSandboxStatus) ProtoMessage()               {}
+func (*PodSandboxStatus) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{20} }
 
 func (m *PodSandboxStatus) GetId() string {
 	if m != nil && m.Id != nil {
@@ -893,9 +921,10 @@ type PodSandboxStatusResponse struct {
 	XXX_unrecognized []byte            `json:"-"`
 }
 
-func (m *PodSandboxStatusResponse) Reset()         { *m = PodSandboxStatusResponse{} }
-func (m *PodSandboxStatusResponse) String() string { return proto.CompactTextString(m) }
-func (*PodSandboxStatusResponse) ProtoMessage()    {}
+func (m *PodSandboxStatusResponse) Reset()                    { *m = PodSandboxStatusResponse{} }
+func (m *PodSandboxStatusResponse) String() string            { return proto.CompactTextString(m) }
+func (*PodSandboxStatusResponse) ProtoMessage()               {}
+func (*PodSandboxStatusResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{21} }
 
 func (m *PodSandboxStatusResponse) GetStatus() *PodSandboxStatus {
 	if m != nil {
@@ -916,13 +945,14 @@ type PodSandboxFilter struct {
 	// LabelSelector to select matches.
 	// Only api.MatchLabels is supported for now and the requirements
 	// are ANDed. MatchExpressions is not supported yet.
-	LabelSelector    map[string]string `protobuf:"bytes,4,rep,name=label_selector" json:"label_selector,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	LabelSelector    map[string]string `protobuf:"bytes,4,rep,name=label_selector,json=labelSelector" json:"label_selector,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	XXX_unrecognized []byte            `json:"-"`
 }
 
-func (m *PodSandboxFilter) Reset()         { *m = PodSandboxFilter{} }
-func (m *PodSandboxFilter) String() string { return proto.CompactTextString(m) }
-func (*PodSandboxFilter) ProtoMessage()    {}
+func (m *PodSandboxFilter) Reset()                    { *m = PodSandboxFilter{} }
+func (m *PodSandboxFilter) String() string            { return proto.CompactTextString(m) }
+func (*PodSandboxFilter) ProtoMessage()               {}
+func (*PodSandboxFilter) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{22} }
 
 func (m *PodSandboxFilter) GetName() string {
 	if m != nil && m.Name != nil {
@@ -958,9 +988,10 @@ type ListPodSandboxRequest struct {
 	XXX_unrecognized []byte            `json:"-"`
 }
 
-func (m *ListPodSandboxRequest) Reset()         { *m = ListPodSandboxRequest{} }
-func (m *ListPodSandboxRequest) String() string { return proto.CompactTextString(m) }
-func (*ListPodSandboxRequest) ProtoMessage()    {}
+func (m *ListPodSandboxRequest) Reset()                    { *m = ListPodSandboxRequest{} }
+func (m *ListPodSandboxRequest) String() string            { return proto.CompactTextString(m) }
+func (*ListPodSandboxRequest) ProtoMessage()               {}
+func (*ListPodSandboxRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{23} }
 
 func (m *ListPodSandboxRequest) GetFilter() *PodSandboxFilter {
 	if m != nil {
@@ -978,15 +1009,16 @@ type PodSandbox struct {
 	// The state of the PodSandbox
 	State *PodSandBoxState `protobuf:"varint,3,opt,name=state,enum=runtime.PodSandBoxState" json:"state,omitempty"`
 	// Creation timestamps of the sandbox
-	CreatedAt *int64 `protobuf:"varint,4,opt,name=created_at" json:"created_at,omitempty"`
+	CreatedAt *int64 `protobuf:"varint,4,opt,name=created_at,json=createdAt" json:"created_at,omitempty"`
 	// The labels of the PodSandbox
 	Labels           map[string]string `protobuf:"bytes,5,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	XXX_unrecognized []byte            `json:"-"`
 }
 
-func (m *PodSandbox) Reset()         { *m = PodSandbox{} }
-func (m *PodSandbox) String() string { return proto.CompactTextString(m) }
-func (*PodSandbox) ProtoMessage()    {}
+func (m *PodSandbox) Reset()                    { *m = PodSandbox{} }
+func (m *PodSandbox) String() string            { return proto.CompactTextString(m) }
+func (*PodSandbox) ProtoMessage()               {}
+func (*PodSandbox) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{24} }
 
 func (m *PodSandbox) GetId() string {
 	if m != nil && m.Id != nil {
@@ -1029,9 +1061,10 @@ type ListPodSandboxResponse struct {
 	XXX_unrecognized []byte        `json:"-"`
 }
 
-func (m *ListPodSandboxResponse) Reset()         { *m = ListPodSandboxResponse{} }
-func (m *ListPodSandboxResponse) String() string { return proto.CompactTextString(m) }
-func (*ListPodSandboxResponse) ProtoMessage()    {}
+func (m *ListPodSandboxResponse) Reset()                    { *m = ListPodSandboxResponse{} }
+func (m *ListPodSandboxResponse) String() string            { return proto.CompactTextString(m) }
+func (*ListPodSandboxResponse) ProtoMessage()               {}
+func (*ListPodSandboxResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{25} }
 
 func (m *ListPodSandboxResponse) GetItems() []*PodSandbox {
 	if m != nil {
@@ -1049,9 +1082,10 @@ type ImageSpec struct {
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *ImageSpec) Reset()         { *m = ImageSpec{} }
-func (m *ImageSpec) String() string { return proto.CompactTextString(m) }
-func (*ImageSpec) ProtoMessage()    {}
+func (m *ImageSpec) Reset()                    { *m = ImageSpec{} }
+func (m *ImageSpec) String() string            { return proto.CompactTextString(m) }
+func (*ImageSpec) ProtoMessage()               {}
+func (*ImageSpec) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{26} }
 
 func (m *ImageSpec) GetImage() string {
 	if m != nil && m.Image != nil {
@@ -1066,9 +1100,10 @@ type KeyValue struct {
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *KeyValue) Reset()         { *m = KeyValue{} }
-func (m *KeyValue) String() string { return proto.CompactTextString(m) }
-func (*KeyValue) ProtoMessage()    {}
+func (m *KeyValue) Reset()                    { *m = KeyValue{} }
+func (m *KeyValue) String() string            { return proto.CompactTextString(m) }
+func (*KeyValue) ProtoMessage()               {}
+func (*KeyValue) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{27} }
 
 func (m *KeyValue) GetKey() string {
 	if m != nil && m.Key != nil {
@@ -1090,21 +1125,22 @@ func (m *KeyValue) GetValue() string {
 // directly.
 type LinuxContainerResources struct {
 	// CPU CFS (Completely Fair Scheduler) period
-	CpuPeriod *int64 `protobuf:"varint,1,opt,name=cpu_period" json:"cpu_period,omitempty"`
+	CpuPeriod *int64 `protobuf:"varint,1,opt,name=cpu_period,json=cpuPeriod" json:"cpu_period,omitempty"`
 	// CPU CFS (Completely Fair Scheduler) quota
-	CpuQuota *int64 `protobuf:"varint,2,opt,name=cpu_quota" json:"cpu_quota,omitempty"`
+	CpuQuota *int64 `protobuf:"varint,2,opt,name=cpu_quota,json=cpuQuota" json:"cpu_quota,omitempty"`
 	// CPU shares (relative weight vs. other containers)
-	CpuShares *int64 `protobuf:"varint,3,opt,name=cpu_shares" json:"cpu_shares,omitempty"`
+	CpuShares *int64 `protobuf:"varint,3,opt,name=cpu_shares,json=cpuShares" json:"cpu_shares,omitempty"`
 	// Memory limit in bytes
-	MemoryLimitInBytes *int64 `protobuf:"varint,4,opt,name=memory_limit_in_bytes" json:"memory_limit_in_bytes,omitempty"`
+	MemoryLimitInBytes *int64 `protobuf:"varint,4,opt,name=memory_limit_in_bytes,json=memoryLimitInBytes" json:"memory_limit_in_bytes,omitempty"`
 	// OOMScoreAdj adjusts the oom-killer score.
-	OomScoreAdj      *int64 `protobuf:"varint,5,opt,name=oom_score_adj" json:"oom_score_adj,omitempty"`
+	OomScoreAdj      *int64 `protobuf:"varint,5,opt,name=oom_score_adj,json=oomScoreAdj" json:"oom_score_adj,omitempty"`
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *LinuxContainerResources) Reset()         { *m = LinuxContainerResources{} }
-func (m *LinuxContainerResources) String() string { return proto.CompactTextString(m) }
-func (*LinuxContainerResources) ProtoMessage()    {}
+func (m *LinuxContainerResources) Reset()                    { *m = LinuxContainerResources{} }
+func (m *LinuxContainerResources) String() string            { return proto.CompactTextString(m) }
+func (*LinuxContainerResources) ProtoMessage()               {}
+func (*LinuxContainerResources) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{28} }
 
 func (m *LinuxContainerResources) GetCpuPeriod() int64 {
 	if m != nil && m.CpuPeriod != nil {
@@ -1150,9 +1186,10 @@ type SELinuxOption struct {
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *SELinuxOption) Reset()         { *m = SELinuxOption{} }
-func (m *SELinuxOption) String() string { return proto.CompactTextString(m) }
-func (*SELinuxOption) ProtoMessage()    {}
+func (m *SELinuxOption) Reset()                    { *m = SELinuxOption{} }
+func (m *SELinuxOption) String() string            { return proto.CompactTextString(m) }
+func (*SELinuxOption) ProtoMessage()               {}
+func (*SELinuxOption) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{29} }
 
 func (m *SELinuxOption) GetUser() string {
 	if m != nil && m.User != nil {
@@ -1185,15 +1222,16 @@ func (m *SELinuxOption) GetLevel() string {
 // Capability contains the container capabilities to add or drop
 type Capability struct {
 	// List of capabilities to add.
-	AddCapabilities []string `protobuf:"bytes,1,rep,name=add_capabilities" json:"add_capabilities,omitempty"`
+	AddCapabilities []string `protobuf:"bytes,1,rep,name=add_capabilities,json=addCapabilities" json:"add_capabilities,omitempty"`
 	// List of capabilities to drop.
-	DropCapabilities []string `protobuf:"bytes,2,rep,name=drop_capabilities" json:"drop_capabilities,omitempty"`
+	DropCapabilities []string `protobuf:"bytes,2,rep,name=drop_capabilities,json=dropCapabilities" json:"drop_capabilities,omitempty"`
 	XXX_unrecognized []byte   `json:"-"`
 }
 
-func (m *Capability) Reset()         { *m = Capability{} }
-func (m *Capability) String() string { return proto.CompactTextString(m) }
-func (*Capability) ProtoMessage()    {}
+func (m *Capability) Reset()                    { *m = Capability{} }
+func (m *Capability) String() string            { return proto.CompactTextString(m) }
+func (*Capability) ProtoMessage()               {}
+func (*Capability) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{30} }
 
 func (m *Capability) GetAddCapabilities() []string {
 	if m != nil {
@@ -1217,15 +1255,16 @@ type LinuxContainerConfig struct {
 	// Capabilities to add or drop.
 	Capabilities *Capability `protobuf:"bytes,2,opt,name=capabilities" json:"capabilities,omitempty"`
 	// Optional SELinux context to be applied.
-	SelinuxOptions *SELinuxOption `protobuf:"bytes,3,opt,name=selinux_options" json:"selinux_options,omitempty"`
+	SelinuxOptions *SELinuxOption `protobuf:"bytes,3,opt,name=selinux_options,json=selinuxOptions" json:"selinux_options,omitempty"`
 	// User contains the user for the container process.
 	User             *LinuxUser `protobuf:"bytes,4,opt,name=user" json:"user,omitempty"`
 	XXX_unrecognized []byte     `json:"-"`
 }
 
-func (m *LinuxContainerConfig) Reset()         { *m = LinuxContainerConfig{} }
-func (m *LinuxContainerConfig) String() string { return proto.CompactTextString(m) }
-func (*LinuxContainerConfig) ProtoMessage()    {}
+func (m *LinuxContainerConfig) Reset()                    { *m = LinuxContainerConfig{} }
+func (m *LinuxContainerConfig) String() string            { return proto.CompactTextString(m) }
+func (*LinuxContainerConfig) ProtoMessage()               {}
+func (*LinuxContainerConfig) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{31} }
 
 func (m *LinuxContainerConfig) GetResources() *LinuxContainerResources {
 	if m != nil {
@@ -1261,13 +1300,14 @@ type LinuxUser struct {
 	// gid specifies the group ID the container process has.
 	Gid *int64 `protobuf:"varint,2,opt,name=gid" json:"gid,omitempty"`
 	// additional_gids specifies additional GIDs the container process has.
-	AdditionalGids   []int64 `protobuf:"varint,3,rep,name=additional_gids" json:"additional_gids,omitempty"`
+	AdditionalGids   []int64 `protobuf:"varint,3,rep,name=additional_gids,json=additionalGids" json:"additional_gids,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *LinuxUser) Reset()         { *m = LinuxUser{} }
-func (m *LinuxUser) String() string { return proto.CompactTextString(m) }
-func (*LinuxUser) ProtoMessage()    {}
+func (m *LinuxUser) Reset()                    { *m = LinuxUser{} }
+func (m *LinuxUser) String() string            { return proto.CompactTextString(m) }
+func (*LinuxUser) ProtoMessage()               {}
+func (*LinuxUser) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{32} }
 
 func (m *LinuxUser) GetUid() int64 {
 	if m != nil && m.Uid != nil {
@@ -1300,7 +1340,7 @@ type ContainerConfig struct {
 	// Args for the Command (i.e., command for docker)
 	Args []string `protobuf:"bytes,4,rep,name=args" json:"args,omitempty"`
 	// Current working directory of the command.
-	WorkingDir *string `protobuf:"bytes,5,opt,name=working_dir" json:"working_dir,omitempty"`
+	WorkingDir *string `protobuf:"bytes,5,opt,name=working_dir,json=workingDir" json:"working_dir,omitempty"`
 	// List of environment variable to set in the container
 	Envs []*KeyValue `protobuf:"bytes,6,rep,name=envs" json:"envs,omitempty"`
 	// Mounts specifies mounts for the container
@@ -1319,7 +1359,7 @@ type ContainerConfig struct {
 	// Processes in privileged containers are essentially equivalent to root on the host.
 	Privileged *bool `protobuf:"varint,10,opt,name=privileged" json:"privileged,omitempty"`
 	// If set, the root filesystem of the container is read-only.
-	ReadonlyRootfs *bool `protobuf:"varint,11,opt,name=readonly_rootfs" json:"readonly_rootfs,omitempty"`
+	ReadonlyRootfs *bool `protobuf:"varint,11,opt,name=readonly_rootfs,json=readonlyRootfs" json:"readonly_rootfs,omitempty"`
 	// Path relative to PodSandboxConfig.LogDirectory for container to store
 	// the log (STDOUT and STDERR) on the host.
 	// E.g.,
@@ -1330,22 +1370,23 @@ type ContainerConfig struct {
 	// container logs are under active discussion in
 	// https://issues.k8s.io/24677. There *may* be future change of direction
 	// for logging as the discussion carries on.
-	LogPath *string `protobuf:"bytes,12,opt,name=log_path" json:"log_path,omitempty"`
+	LogPath *string `protobuf:"bytes,12,opt,name=log_path,json=logPath" json:"log_path,omitempty"`
 	// Variables for interactive containers, these have very specialized
 	// use-cases (e.g. debugging).
 	// TODO: Determine if we need to continue supporting these fields that are
 	// part of Kubernetes's Container Spec.
 	Stdin     *bool `protobuf:"varint,13,opt,name=stdin" json:"stdin,omitempty"`
-	StdinOnce *bool `protobuf:"varint,14,opt,name=stdin_once" json:"stdin_once,omitempty"`
+	StdinOnce *bool `protobuf:"varint,14,opt,name=stdin_once,json=stdinOnce" json:"stdin_once,omitempty"`
 	Tty       *bool `protobuf:"varint,15,opt,name=tty" json:"tty,omitempty"`
 	// Linux contains configuration specific to Linux containers.
 	Linux            *LinuxContainerConfig `protobuf:"bytes,16,opt,name=linux" json:"linux,omitempty"`
 	XXX_unrecognized []byte                `json:"-"`
 }
 
-func (m *ContainerConfig) Reset()         { *m = ContainerConfig{} }
-func (m *ContainerConfig) String() string { return proto.CompactTextString(m) }
-func (*ContainerConfig) ProtoMessage()    {}
+func (m *ContainerConfig) Reset()                    { *m = ContainerConfig{} }
+func (m *ContainerConfig) String() string            { return proto.CompactTextString(m) }
+func (*ContainerConfig) ProtoMessage()               {}
+func (*ContainerConfig) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{33} }
 
 func (m *ContainerConfig) GetName() string {
 	if m != nil && m.Name != nil {
@@ -1461,17 +1502,18 @@ func (m *ContainerConfig) GetLinux() *LinuxContainerConfig {
 
 type CreateContainerRequest struct {
 	// The id of the PodSandbox
-	PodSandboxId *string `protobuf:"bytes,1,opt,name=pod_sandbox_id" json:"pod_sandbox_id,omitempty"`
+	PodSandboxId *string `protobuf:"bytes,1,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"`
 	// The config of the container
 	Config *ContainerConfig `protobuf:"bytes,2,opt,name=config" json:"config,omitempty"`
 	// The config of the PodSandbox
-	SandboxConfig    *PodSandboxConfig `protobuf:"bytes,3,opt,name=sandbox_config" json:"sandbox_config,omitempty"`
+	SandboxConfig    *PodSandboxConfig `protobuf:"bytes,3,opt,name=sandbox_config,json=sandboxConfig" json:"sandbox_config,omitempty"`
 	XXX_unrecognized []byte            `json:"-"`
 }
 
-func (m *CreateContainerRequest) Reset()         { *m = CreateContainerRequest{} }
-func (m *CreateContainerRequest) String() string { return proto.CompactTextString(m) }
-func (*CreateContainerRequest) ProtoMessage()    {}
+func (m *CreateContainerRequest) Reset()                    { *m = CreateContainerRequest{} }
+func (m *CreateContainerRequest) String() string            { return proto.CompactTextString(m) }
+func (*CreateContainerRequest) ProtoMessage()               {}
+func (*CreateContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{34} }
 
 func (m *CreateContainerRequest) GetPodSandboxId() string {
 	if m != nil && m.PodSandboxId != nil {
@@ -1496,13 +1538,14 @@ func (m *CreateContainerRequest) GetSandboxConfig() *PodSandboxConfig {
 
 type CreateContainerResponse struct {
 	// The id of the created container
-	ContainerId      *string `protobuf:"bytes,1,opt,name=container_id" json:"container_id,omitempty"`
+	ContainerId      *string `protobuf:"bytes,1,opt,name=container_id,json=containerId" json:"container_id,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *CreateContainerResponse) Reset()         { *m = CreateContainerResponse{} }
-func (m *CreateContainerResponse) String() string { return proto.CompactTextString(m) }
-func (*CreateContainerResponse) ProtoMessage()    {}
+func (m *CreateContainerResponse) Reset()                    { *m = CreateContainerResponse{} }
+func (m *CreateContainerResponse) String() string            { return proto.CompactTextString(m) }
+func (*CreateContainerResponse) ProtoMessage()               {}
+func (*CreateContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{35} }
 
 func (m *CreateContainerResponse) GetContainerId() string {
 	if m != nil && m.ContainerId != nil {
@@ -1513,13 +1556,14 @@ func (m *CreateContainerResponse) GetContainerId() string {
 
 type StartContainerRequest struct {
 	// The id of the container
-	ContainerId      *string `protobuf:"bytes,1,opt,name=container_id" json:"container_id,omitempty"`
+	ContainerId      *string `protobuf:"bytes,1,opt,name=container_id,json=containerId" json:"container_id,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *StartContainerRequest) Reset()         { *m = StartContainerRequest{} }
-func (m *StartContainerRequest) String() string { return proto.CompactTextString(m) }
-func (*StartContainerRequest) ProtoMessage()    {}
+func (m *StartContainerRequest) Reset()                    { *m = StartContainerRequest{} }
+func (m *StartContainerRequest) String() string            { return proto.CompactTextString(m) }
+func (*StartContainerRequest) ProtoMessage()               {}
+func (*StartContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{36} }
 
 func (m *StartContainerRequest) GetContainerId() string {
 	if m != nil && m.ContainerId != nil {
@@ -1532,21 +1576,23 @@ type StartContainerResponse struct {
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *StartContainerResponse) Reset()         { *m = StartContainerResponse{} }
-func (m *StartContainerResponse) String() string { return proto.CompactTextString(m) }
-func (*StartContainerResponse) ProtoMessage()    {}
+func (m *StartContainerResponse) Reset()                    { *m = StartContainerResponse{} }
+func (m *StartContainerResponse) String() string            { return proto.CompactTextString(m) }
+func (*StartContainerResponse) ProtoMessage()               {}
+func (*StartContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{37} }
 
 type StopContainerRequest struct {
 	// The id of the container
-	ContainerId *string `protobuf:"bytes,1,opt,name=container_id" json:"container_id,omitempty"`
+	ContainerId *string `protobuf:"bytes,1,opt,name=container_id,json=containerId" json:"container_id,omitempty"`
 	// Timeout in seconds to stop the container
 	Timeout          *int64 `protobuf:"varint,2,opt,name=timeout" json:"timeout,omitempty"`
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *StopContainerRequest) Reset()         { *m = StopContainerRequest{} }
-func (m *StopContainerRequest) String() string { return proto.CompactTextString(m) }
-func (*StopContainerRequest) ProtoMessage()    {}
+func (m *StopContainerRequest) Reset()                    { *m = StopContainerRequest{} }
+func (m *StopContainerRequest) String() string            { return proto.CompactTextString(m) }
+func (*StopContainerRequest) ProtoMessage()               {}
+func (*StopContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{38} }
 
 func (m *StopContainerRequest) GetContainerId() string {
 	if m != nil && m.ContainerId != nil {
@@ -1566,19 +1612,21 @@ type StopContainerResponse struct {
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *StopContainerResponse) Reset()         { *m = StopContainerResponse{} }
-func (m *StopContainerResponse) String() string { return proto.CompactTextString(m) }
-func (*StopContainerResponse) ProtoMessage()    {}
+func (m *StopContainerResponse) Reset()                    { *m = StopContainerResponse{} }
+func (m *StopContainerResponse) String() string            { return proto.CompactTextString(m) }
+func (*StopContainerResponse) ProtoMessage()               {}
+func (*StopContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{39} }
 
 type RemoveContainerRequest struct {
 	// The id of the container
-	ContainerId      *string `protobuf:"bytes,1,opt,name=container_id" json:"container_id,omitempty"`
+	ContainerId      *string `protobuf:"bytes,1,opt,name=container_id,json=containerId" json:"container_id,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *RemoveContainerRequest) Reset()         { *m = RemoveContainerRequest{} }
-func (m *RemoveContainerRequest) String() string { return proto.CompactTextString(m) }
-func (*RemoveContainerRequest) ProtoMessage()    {}
+func (m *RemoveContainerRequest) Reset()                    { *m = RemoveContainerRequest{} }
+func (m *RemoveContainerRequest) String() string            { return proto.CompactTextString(m) }
+func (*RemoveContainerRequest) ProtoMessage()               {}
+func (*RemoveContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{40} }
 
 func (m *RemoveContainerRequest) GetContainerId() string {
 	if m != nil && m.ContainerId != nil {
@@ -1591,9 +1639,10 @@ type RemoveContainerResponse struct {
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *RemoveContainerResponse) Reset()         { *m = RemoveContainerResponse{} }
-func (m *RemoveContainerResponse) String() string { return proto.CompactTextString(m) }
-func (*RemoveContainerResponse) ProtoMessage()    {}
+func (m *RemoveContainerResponse) Reset()                    { *m = RemoveContainerResponse{} }
+func (m *RemoveContainerResponse) String() string            { return proto.CompactTextString(m) }
+func (*RemoveContainerResponse) ProtoMessage()               {}
+func (*RemoveContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{41} }
 
 // ContainerFilter is used to filter containers.
 // All those fields are combined with 'AND'
@@ -1605,17 +1654,18 @@ type ContainerFilter struct {
 	// State of the contianer.
 	State *ContainerState `protobuf:"varint,3,opt,name=state,enum=runtime.ContainerState" json:"state,omitempty"`
 	// The id of the pod sandbox
-	PodSandboxId *string `protobuf:"bytes,4,opt,name=pod_sandbox_id" json:"pod_sandbox_id,omitempty"`
+	PodSandboxId *string `protobuf:"bytes,4,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"`
 	// LabelSelector to select matches.
 	// Only api.MatchLabels is supported for now and the requirements
 	// are ANDed. MatchExpressions is not supported yet.
-	LabelSelector    map[string]string `protobuf:"bytes,5,rep,name=label_selector" json:"label_selector,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	LabelSelector    map[string]string `protobuf:"bytes,5,rep,name=label_selector,json=labelSelector" json:"label_selector,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	XXX_unrecognized []byte            `json:"-"`
 }
 
-func (m *ContainerFilter) Reset()         { *m = ContainerFilter{} }
-func (m *ContainerFilter) String() string { return proto.CompactTextString(m) }
-func (*ContainerFilter) ProtoMessage()    {}
+func (m *ContainerFilter) Reset()                    { *m = ContainerFilter{} }
+func (m *ContainerFilter) String() string            { return proto.CompactTextString(m) }
+func (*ContainerFilter) ProtoMessage()               {}
+func (*ContainerFilter) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{42} }
 
 func (m *ContainerFilter) GetName() string {
 	if m != nil && m.Name != nil {
@@ -1657,9 +1707,10 @@ type ListContainersRequest struct {
 	XXX_unrecognized []byte           `json:"-"`
 }
 
-func (m *ListContainersRequest) Reset()         { *m = ListContainersRequest{} }
-func (m *ListContainersRequest) String() string { return proto.CompactTextString(m) }
-func (*ListContainersRequest) ProtoMessage()    {}
+func (m *ListContainersRequest) Reset()                    { *m = ListContainersRequest{} }
+func (m *ListContainersRequest) String() string            { return proto.CompactTextString(m) }
+func (*ListContainersRequest) ProtoMessage()               {}
+func (*ListContainersRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{43} }
 
 func (m *ListContainersRequest) GetFilter() *ContainerFilter {
 	if m != nil {
@@ -1680,7 +1731,7 @@ type Container struct {
 	Image *ImageSpec `protobuf:"bytes,3,opt,name=image" json:"image,omitempty"`
 	// Reference to the image in use. For most runtimes, this should be an
 	// image ID.
-	ImageRef *string `protobuf:"bytes,4,opt,name=image_ref" json:"image_ref,omitempty"`
+	ImageRef *string `protobuf:"bytes,4,opt,name=image_ref,json=imageRef" json:"image_ref,omitempty"`
 	// State is the state of the container.
 	State *ContainerState `protobuf:"varint,5,opt,name=state,enum=runtime.ContainerState" json:"state,omitempty"`
 	// Labels are key value pairs that may be used to scope and select individual resources.
@@ -1688,9 +1739,10 @@ type Container struct {
 	XXX_unrecognized []byte            `json:"-"`
 }
 
-func (m *Container) Reset()         { *m = Container{} }
-func (m *Container) String() string { return proto.CompactTextString(m) }
-func (*Container) ProtoMessage()    {}
+func (m *Container) Reset()                    { *m = Container{} }
+func (m *Container) String() string            { return proto.CompactTextString(m) }
+func (*Container) ProtoMessage()               {}
+func (*Container) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{44} }
 
 func (m *Container) GetId() string {
 	if m != nil && m.Id != nil {
@@ -1740,9 +1792,10 @@ type ListContainersResponse struct {
 	XXX_unrecognized []byte       `json:"-"`
 }
 
-func (m *ListContainersResponse) Reset()         { *m = ListContainersResponse{} }
-func (m *ListContainersResponse) String() string { return proto.CompactTextString(m) }
-func (*ListContainersResponse) ProtoMessage()    {}
+func (m *ListContainersResponse) Reset()                    { *m = ListContainersResponse{} }
+func (m *ListContainersResponse) String() string            { return proto.CompactTextString(m) }
+func (*ListContainersResponse) ProtoMessage()               {}
+func (*ListContainersResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{45} }
 
 func (m *ListContainersResponse) GetContainers() []*Container {
 	if m != nil {
@@ -1753,13 +1806,14 @@ func (m *ListContainersResponse) GetContainers() []*Container {
 
 type ContainerStatusRequest struct {
 	// The id of the container
-	ContainerId      *string `protobuf:"bytes,1,opt,name=container_id" json:"container_id,omitempty"`
+	ContainerId      *string `protobuf:"bytes,1,opt,name=container_id,json=containerId" json:"container_id,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *ContainerStatusRequest) Reset()         { *m = ContainerStatusRequest{} }
-func (m *ContainerStatusRequest) String() string { return proto.CompactTextString(m) }
-func (*ContainerStatusRequest) ProtoMessage()    {}
+func (m *ContainerStatusRequest) Reset()                    { *m = ContainerStatusRequest{} }
+func (m *ContainerStatusRequest) String() string            { return proto.CompactTextString(m) }
+func (*ContainerStatusRequest) ProtoMessage()               {}
+func (*ContainerStatusRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{46} }
 
 func (m *ContainerStatusRequest) GetContainerId() string {
 	if m != nil && m.ContainerId != nil {
@@ -1777,18 +1831,18 @@ type ContainerStatus struct {
 	// Status of the container.
 	State *ContainerState `protobuf:"varint,3,opt,name=state,enum=runtime.ContainerState" json:"state,omitempty"`
 	// Creation time of the container.
-	CreatedAt *int64 `protobuf:"varint,4,opt,name=created_at" json:"created_at,omitempty"`
+	CreatedAt *int64 `protobuf:"varint,4,opt,name=created_at,json=createdAt" json:"created_at,omitempty"`
 	// Start time of the container.
-	StartedAt *int64 `protobuf:"varint,5,opt,name=started_at" json:"started_at,omitempty"`
+	StartedAt *int64 `protobuf:"varint,5,opt,name=started_at,json=startedAt" json:"started_at,omitempty"`
 	// Finish time of the container.
-	FinishedAt *int64 `protobuf:"varint,6,opt,name=finished_at" json:"finished_at,omitempty"`
+	FinishedAt *int64 `protobuf:"varint,6,opt,name=finished_at,json=finishedAt" json:"finished_at,omitempty"`
 	// Exit code of the container.
-	ExitCode *int32 `protobuf:"varint,7,opt,name=exit_code" json:"exit_code,omitempty"`
+	ExitCode *int32 `protobuf:"varint,7,opt,name=exit_code,json=exitCode" json:"exit_code,omitempty"`
 	// The spec of the image
 	Image *ImageSpec `protobuf:"bytes,8,opt,name=image" json:"image,omitempty"`
 	// Reference to the image in use. For most runtimes, this should be an
 	// image ID
-	ImageRef *string `protobuf:"bytes,9,opt,name=image_ref" json:"image_ref,omitempty"`
+	ImageRef *string `protobuf:"bytes,9,opt,name=image_ref,json=imageRef" json:"image_ref,omitempty"`
 	// A string explains why container is in such a status.
 	Reason *string `protobuf:"bytes,10,opt,name=reason" json:"reason,omitempty"`
 	// Labels are key value pairs that may be used to scope and select individual resources.
@@ -1800,9 +1854,10 @@ type ContainerStatus struct {
 	XXX_unrecognized []byte   `json:"-"`
 }
 
-func (m *ContainerStatus) Reset()         { *m = ContainerStatus{} }
-func (m *ContainerStatus) String() string { return proto.CompactTextString(m) }
-func (*ContainerStatus) ProtoMessage()    {}
+func (m *ContainerStatus) Reset()                    { *m = ContainerStatus{} }
+func (m *ContainerStatus) String() string            { return proto.CompactTextString(m) }
+func (*ContainerStatus) ProtoMessage()               {}
+func (*ContainerStatus) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{47} }
 
 func (m *ContainerStatus) GetId() string {
 	if m != nil && m.Id != nil {
@@ -1901,9 +1956,10 @@ type ContainerStatusResponse struct {
 	XXX_unrecognized []byte           `json:"-"`
 }
 
-func (m *ContainerStatusResponse) Reset()         { *m = ContainerStatusResponse{} }
-func (m *ContainerStatusResponse) String() string { return proto.CompactTextString(m) }
-func (*ContainerStatusResponse) ProtoMessage()    {}
+func (m *ContainerStatusResponse) Reset()                    { *m = ContainerStatusResponse{} }
+func (m *ContainerStatusResponse) String() string            { return proto.CompactTextString(m) }
+func (*ContainerStatusResponse) ProtoMessage()               {}
+func (*ContainerStatusResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{48} }
 
 func (m *ContainerStatusResponse) GetStatus() *ContainerStatus {
 	if m != nil {
@@ -1914,7 +1970,7 @@ func (m *ContainerStatusResponse) GetStatus() *ContainerStatus {
 
 type ExecRequest struct {
 	// The id of the container
-	ContainerId *string `protobuf:"bytes,1,opt,name=container_id" json:"container_id,omitempty"`
+	ContainerId *string `protobuf:"bytes,1,opt,name=container_id,json=containerId" json:"container_id,omitempty"`
 	// The cmd to execute
 	Cmd []string `protobuf:"bytes,2,rep,name=cmd" json:"cmd,omitempty"`
 	// Whether use tty
@@ -1924,9 +1980,10 @@ type ExecRequest struct {
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *ExecRequest) Reset()         { *m = ExecRequest{} }
-func (m *ExecRequest) String() string { return proto.CompactTextString(m) }
-func (*ExecRequest) ProtoMessage()    {}
+func (m *ExecRequest) Reset()                    { *m = ExecRequest{} }
+func (m *ExecRequest) String() string            { return proto.CompactTextString(m) }
+func (*ExecRequest) ProtoMessage()               {}
+func (*ExecRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{49} }
 
 func (m *ExecRequest) GetContainerId() string {
 	if m != nil && m.ContainerId != nil {
@@ -1964,9 +2021,10 @@ type ExecResponse struct {
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *ExecResponse) Reset()         { *m = ExecResponse{} }
-func (m *ExecResponse) String() string { return proto.CompactTextString(m) }
-func (*ExecResponse) ProtoMessage()    {}
+func (m *ExecResponse) Reset()                    { *m = ExecResponse{} }
+func (m *ExecResponse) String() string            { return proto.CompactTextString(m) }
+func (*ExecResponse) ProtoMessage()               {}
+func (*ExecResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{50} }
 
 func (m *ExecResponse) GetStdout() []byte {
 	if m != nil {
@@ -1988,9 +2046,10 @@ type ImageFilter struct {
 	XXX_unrecognized []byte     `json:"-"`
 }
 
-func (m *ImageFilter) Reset()         { *m = ImageFilter{} }
-func (m *ImageFilter) String() string { return proto.CompactTextString(m) }
-func (*ImageFilter) ProtoMessage()    {}
+func (m *ImageFilter) Reset()                    { *m = ImageFilter{} }
+func (m *ImageFilter) String() string            { return proto.CompactTextString(m) }
+func (*ImageFilter) ProtoMessage()               {}
+func (*ImageFilter) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{51} }
 
 func (m *ImageFilter) GetImage() *ImageSpec {
 	if m != nil {
@@ -2005,9 +2064,10 @@ type ListImagesRequest struct {
 	XXX_unrecognized []byte       `json:"-"`
 }
 
-func (m *ListImagesRequest) Reset()         { *m = ListImagesRequest{} }
-func (m *ListImagesRequest) String() string { return proto.CompactTextString(m) }
-func (*ListImagesRequest) ProtoMessage()    {}
+func (m *ListImagesRequest) Reset()                    { *m = ListImagesRequest{} }
+func (m *ListImagesRequest) String() string            { return proto.CompactTextString(m) }
+func (*ListImagesRequest) ProtoMessage()               {}
+func (*ListImagesRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{52} }
 
 func (m *ListImagesRequest) GetFilter() *ImageFilter {
 	if m != nil {
@@ -2021,17 +2081,18 @@ type Image struct {
 	// ID of the image.
 	Id *string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
 	// Other names by which this image is known.
-	RepoTags []string `protobuf:"bytes,2,rep,name=repo_tags" json:"repo_tags,omitempty"`
+	RepoTags []string `protobuf:"bytes,2,rep,name=repo_tags,json=repoTags" json:"repo_tags,omitempty"`
 	// Digests by which this image is known.
-	RepoDigests []string `protobuf:"bytes,3,rep,name=repo_digests" json:"repo_digests,omitempty"`
+	RepoDigests []string `protobuf:"bytes,3,rep,name=repo_digests,json=repoDigests" json:"repo_digests,omitempty"`
 	// The size of the image in bytes.
 	Size_            *uint64 `protobuf:"varint,4,opt,name=size" json:"size,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *Image) Reset()         { *m = Image{} }
-func (m *Image) String() string { return proto.CompactTextString(m) }
-func (*Image) ProtoMessage()    {}
+func (m *Image) Reset()                    { *m = Image{} }
+func (m *Image) String() string            { return proto.CompactTextString(m) }
+func (*Image) ProtoMessage()               {}
+func (*Image) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{53} }
 
 func (m *Image) GetId() string {
 	if m != nil && m.Id != nil {
@@ -2067,9 +2128,10 @@ type ListImagesResponse struct {
 	XXX_unrecognized []byte   `json:"-"`
 }
 
-func (m *ListImagesResponse) Reset()         { *m = ListImagesResponse{} }
-func (m *ListImagesResponse) String() string { return proto.CompactTextString(m) }
-func (*ListImagesResponse) ProtoMessage()    {}
+func (m *ListImagesResponse) Reset()                    { *m = ListImagesResponse{} }
+func (m *ListImagesResponse) String() string            { return proto.CompactTextString(m) }
+func (*ListImagesResponse) ProtoMessage()               {}
+func (*ListImagesResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{54} }
 
 func (m *ListImagesResponse) GetImages() []*Image {
 	if m != nil {
@@ -2084,9 +2146,10 @@ type ImageStatusRequest struct {
 	XXX_unrecognized []byte     `json:"-"`
 }
 
-func (m *ImageStatusRequest) Reset()         { *m = ImageStatusRequest{} }
-func (m *ImageStatusRequest) String() string { return proto.CompactTextString(m) }
-func (*ImageStatusRequest) ProtoMessage()    {}
+func (m *ImageStatusRequest) Reset()                    { *m = ImageStatusRequest{} }
+func (m *ImageStatusRequest) String() string            { return proto.CompactTextString(m) }
+func (*ImageStatusRequest) ProtoMessage()               {}
+func (*ImageStatusRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{55} }
 
 func (m *ImageStatusRequest) GetImage() *ImageSpec {
 	if m != nil {
@@ -2101,9 +2164,10 @@ type ImageStatusResponse struct {
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *ImageStatusResponse) Reset()         { *m = ImageStatusResponse{} }
-func (m *ImageStatusResponse) String() string { return proto.CompactTextString(m) }
-func (*ImageStatusResponse) ProtoMessage()    {}
+func (m *ImageStatusResponse) Reset()                    { *m = ImageStatusResponse{} }
+func (m *ImageStatusResponse) String() string            { return proto.CompactTextString(m) }
+func (*ImageStatusResponse) ProtoMessage()               {}
+func (*ImageStatusResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{56} }
 
 func (m *ImageStatusResponse) GetImage() *Image {
 	if m != nil {
@@ -2117,18 +2181,19 @@ type AuthConfig struct {
 	Username      *string `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
 	Password      *string `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"`
 	Auth          *string `protobuf:"bytes,3,opt,name=auth" json:"auth,omitempty"`
-	ServerAddress *string `protobuf:"bytes,4,opt,name=server_address" json:"server_address,omitempty"`
+	ServerAddress *string `protobuf:"bytes,4,opt,name=server_address,json=serverAddress" json:"server_address,omitempty"`
 	// IdentityToken is used to authenticate the user and get
 	// an access token for the registry.
-	IdentityToken *string `protobuf:"bytes,5,opt,name=identity_token" json:"identity_token,omitempty"`
+	IdentityToken *string `protobuf:"bytes,5,opt,name=identity_token,json=identityToken" json:"identity_token,omitempty"`
 	// RegistryToken is a bearer token to be sent to a registry
-	RegistryToken    *string `protobuf:"bytes,6,opt,name=registry_token" json:"registry_token,omitempty"`
+	RegistryToken    *string `protobuf:"bytes,6,opt,name=registry_token,json=registryToken" json:"registry_token,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *AuthConfig) Reset()         { *m = AuthConfig{} }
-func (m *AuthConfig) String() string { return proto.CompactTextString(m) }
-func (*AuthConfig) ProtoMessage()    {}
+func (m *AuthConfig) Reset()                    { *m = AuthConfig{} }
+func (m *AuthConfig) String() string            { return proto.CompactTextString(m) }
+func (*AuthConfig) ProtoMessage()               {}
+func (*AuthConfig) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{57} }
 
 func (m *AuthConfig) GetUsername() string {
 	if m != nil && m.Username != nil {
@@ -2178,13 +2243,14 @@ type PullImageRequest struct {
 	// The auth config for pulling image
 	Auth *AuthConfig `protobuf:"bytes,2,opt,name=auth" json:"auth,omitempty"`
 	// The config of the PodSandbox, which is used to pull image in PodSandbox context
-	SandboxConfig    *PodSandboxConfig `protobuf:"bytes,3,opt,name=sandbox_config" json:"sandbox_config,omitempty"`
+	SandboxConfig    *PodSandboxConfig `protobuf:"bytes,3,opt,name=sandbox_config,json=sandboxConfig" json:"sandbox_config,omitempty"`
 	XXX_unrecognized []byte            `json:"-"`
 }
 
-func (m *PullImageRequest) Reset()         { *m = PullImageRequest{} }
-func (m *PullImageRequest) String() string { return proto.CompactTextString(m) }
-func (*PullImageRequest) ProtoMessage()    {}
+func (m *PullImageRequest) Reset()                    { *m = PullImageRequest{} }
+func (m *PullImageRequest) String() string            { return proto.CompactTextString(m) }
+func (*PullImageRequest) ProtoMessage()               {}
+func (*PullImageRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{58} }
 
 func (m *PullImageRequest) GetImage() *ImageSpec {
 	if m != nil {
@@ -2211,9 +2277,10 @@ type PullImageResponse struct {
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *PullImageResponse) Reset()         { *m = PullImageResponse{} }
-func (m *PullImageResponse) String() string { return proto.CompactTextString(m) }
-func (*PullImageResponse) ProtoMessage()    {}
+func (m *PullImageResponse) Reset()                    { *m = PullImageResponse{} }
+func (m *PullImageResponse) String() string            { return proto.CompactTextString(m) }
+func (*PullImageResponse) ProtoMessage()               {}
+func (*PullImageResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{59} }
 
 type RemoveImageRequest struct {
 	// The spec of the image
@@ -2221,9 +2288,10 @@ type RemoveImageRequest struct {
 	XXX_unrecognized []byte     `json:"-"`
 }
 
-func (m *RemoveImageRequest) Reset()         { *m = RemoveImageRequest{} }
-func (m *RemoveImageRequest) String() string { return proto.CompactTextString(m) }
-func (*RemoveImageRequest) ProtoMessage()    {}
+func (m *RemoveImageRequest) Reset()                    { *m = RemoveImageRequest{} }
+func (m *RemoveImageRequest) String() string            { return proto.CompactTextString(m) }
+func (*RemoveImageRequest) ProtoMessage()               {}
+func (*RemoveImageRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{60} }
 
 func (m *RemoveImageRequest) GetImage() *ImageSpec {
 	if m != nil {
@@ -2236,9 +2304,10 @@ type RemoveImageResponse struct {
 	XXX_unrecognized []byte `json:"-"`
 }
 
-func (m *RemoveImageResponse) Reset()         { *m = RemoveImageResponse{} }
-func (m *RemoveImageResponse) String() string { return proto.CompactTextString(m) }
-func (*RemoveImageResponse) ProtoMessage()    {}
+func (m *RemoveImageResponse) Reset()                    { *m = RemoveImageResponse{} }
+func (m *RemoveImageResponse) String() string            { return proto.CompactTextString(m) }
+func (*RemoveImageResponse) ProtoMessage()               {}
+func (*RemoveImageResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{61} }
 
 func init() {
 	proto.RegisterType((*VersionRequest)(nil), "runtime.VersionRequest")
@@ -2312,6 +2381,10 @@ func init() {
 var _ context.Context
 var _ grpc.ClientConn
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion3
+
 // Client API for RuntimeService service
 
 type RuntimeServiceClient interface {
@@ -2537,148 +2610,220 @@ func RegisterRuntimeServiceServer(s *grpc.Server, srv RuntimeServiceServer) {
 	s.RegisterService(&_RuntimeService_serviceDesc, srv)
 }
 
-func _RuntimeService_Version_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_Version_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(VersionRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).Version(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).Version(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/Version",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).Version(ctx, req.(*VersionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _RuntimeService_CreatePodSandbox_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_CreatePodSandbox_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(CreatePodSandboxRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).CreatePodSandbox(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).CreatePodSandbox(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/CreatePodSandbox",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).CreatePodSandbox(ctx, req.(*CreatePodSandboxRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _RuntimeService_StopPodSandbox_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_StopPodSandbox_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(StopPodSandboxRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).StopPodSandbox(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).StopPodSandbox(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/StopPodSandbox",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).StopPodSandbox(ctx, req.(*StopPodSandboxRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _RuntimeService_RemovePodSandbox_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_RemovePodSandbox_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(RemovePodSandboxRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).RemovePodSandbox(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).RemovePodSandbox(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/RemovePodSandbox",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).RemovePodSandbox(ctx, req.(*RemovePodSandboxRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _RuntimeService_PodSandboxStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_PodSandboxStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(PodSandboxStatusRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).PodSandboxStatus(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).PodSandboxStatus(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/PodSandboxStatus",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).PodSandboxStatus(ctx, req.(*PodSandboxStatusRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _RuntimeService_ListPodSandbox_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_ListPodSandbox_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ListPodSandboxRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).ListPodSandbox(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).ListPodSandbox(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/ListPodSandbox",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).ListPodSandbox(ctx, req.(*ListPodSandboxRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _RuntimeService_CreateContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_CreateContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(CreateContainerRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).CreateContainer(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).CreateContainer(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/CreateContainer",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).CreateContainer(ctx, req.(*CreateContainerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _RuntimeService_StartContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_StartContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(StartContainerRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).StartContainer(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).StartContainer(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/StartContainer",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).StartContainer(ctx, req.(*StartContainerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _RuntimeService_StopContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_StopContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(StopContainerRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).StopContainer(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).StopContainer(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/StopContainer",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).StopContainer(ctx, req.(*StopContainerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _RuntimeService_RemoveContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_RemoveContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(RemoveContainerRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).RemoveContainer(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).RemoveContainer(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/RemoveContainer",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).RemoveContainer(ctx, req.(*RemoveContainerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _RuntimeService_ListContainers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_ListContainers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ListContainersRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).ListContainers(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).ListContainers(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/ListContainers",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).ListContainers(ctx, req.(*ListContainersRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _RuntimeService_ContainerStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _RuntimeService_ContainerStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ContainerStatusRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(RuntimeServiceServer).ContainerStatus(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(RuntimeServiceServer).ContainerStatus(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.RuntimeService/ContainerStatus",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RuntimeServiceServer).ContainerStatus(ctx, req.(*ContainerStatusRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
 func _RuntimeService_Exec_Handler(srv interface{}, stream grpc.ServerStream) error {
@@ -2768,6 +2913,7 @@ var _RuntimeService_serviceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
+	Metadata: fileDescriptorApi,
 }
 
 // Client API for ImageService service
@@ -2846,52 +2992,76 @@ func RegisterImageServiceServer(s *grpc.Server, srv ImageServiceServer) {
 	s.RegisterService(&_ImageService_serviceDesc, srv)
 }
 
-func _ImageService_ListImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _ImageService_ListImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ListImagesRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(ImageServiceServer).ListImages(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(ImageServiceServer).ListImages(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.ImageService/ListImages",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageServiceServer).ListImages(ctx, req.(*ListImagesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _ImageService_ImageStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _ImageService_ImageStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ImageStatusRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(ImageServiceServer).ImageStatus(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(ImageServiceServer).ImageStatus(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.ImageService/ImageStatus",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageServiceServer).ImageStatus(ctx, req.(*ImageStatusRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _ImageService_PullImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _ImageService_PullImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(PullImageRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(ImageServiceServer).PullImage(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(ImageServiceServer).PullImage(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.ImageService/PullImage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageServiceServer).PullImage(ctx, req.(*PullImageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _ImageService_RemoveImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _ImageService_RemoveImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(RemoveImageRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(ImageServiceServer).RemoveImage(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(ImageServiceServer).RemoveImage(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/runtime.ImageService/RemoveImage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageServiceServer).RemoveImage(ctx, req.(*RemoveImageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
 var _ImageService_serviceDesc = grpc.ServiceDesc{
@@ -2915,5 +3085,187 @@ var _ImageService_serviceDesc = grpc.ServiceDesc{
 			Handler:    _ImageService_RemoveImage_Handler,
 		},
 	},
-	Streams: []grpc.StreamDesc{},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: fileDescriptorApi,
+}
+
+var fileDescriptorApi = []byte{
+	// 2821 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x1a, 0xcb, 0x72, 0x1c, 0x49,
+	0xd1, 0xad, 0xd1, 0x48, 0x33, 0x39, 0x9a, 0xd1, 0xa8, 0x24, 0x4b, 0xb3, 0xe3, 0x5d, 0x3f, 0x9a,
+	0x5d, 0xf0, 0x6a, 0x77, 0x85, 0x11, 0x8f, 0xc5, 0xde, 0x5d, 0xaf, 0xb5, 0x92, 0x70, 0xc8, 0x96,
+	0x65, 0xd1, 0x63, 0x9b, 0xf5, 0x69, 0xa2, 0x3d, 0x5d, 0x92, 0xda, 0x9e, 0xe9, 0xee, 0xed, 0xee,
+	0x11, 0x16, 0x11, 0x9c, 0xf8, 0x09, 0x8e, 0x1c, 0x88, 0xe0, 0xc4, 0x85, 0x08, 0x7e, 0x02, 0x82,
+	0x03, 0xc1, 0x77, 0x70, 0xe2, 0xc2, 0x85, 0x80, 0xac, 0x47, 0x57, 0x57, 0x3f, 0x46, 0x96, 0x6c,
+	0x02, 0x73, 0xeb, 0xca, 0xcc, 0xca, 0xca, 0xca, 0xcc, 0xca, 0x47, 0x55, 0x43, 0xdd, 0x0e, 0xdc,
+	0xb5, 0x20, 0xf4, 0x63, 0x9f, 0xcc, 0x86, 0x63, 0x2f, 0x76, 0x47, 0xd4, 0x5c, 0x85, 0xd6, 0x13,
+	0x1a, 0x46, 0xae, 0xef, 0x59, 0xf4, 0x9b, 0x31, 0x8d, 0x62, 0xd2, 0x81, 0xd9, 0x63, 0x01, 0xe9,
+	0x18, 0x57, 0x8d, 0xeb, 0x75, 0x2b, 0x19, 0x9a, 0xbf, 0x33, 0x60, 0x5e, 0x11, 0x47, 0x81, 0xef,
+	0x45, 0x74, 0x32, 0x35, 0xb9, 0x06, 0x73, 0x72, 0x91, 0xbe, 0x67, 0x8f, 0x68, 0x67, 0x8a, 0xa3,
+	0x1b, 0x12, 0xb6, 0x87, 0x20, 0xf2, 0x1d, 0x98, 0x4f, 0x48, 0x12, 0x26, 0x15, 0x4e, 0xd5, 0x92,
+	0x60, 0xb9, 0x1a, 0x59, 0x83, 0xc5, 0x84, 0x10, 0xf7, 0xa0, 0x88, 0xa7, 0x39, 0xf1, 0x82, 0x44,
+	0x6d, 0x04, 0xae, 0xa4, 0x37, 0x37, 0xa0, 0xbe, 0xb5, 0xd7, 0x7b, 0x18, 0xc4, 0x6c, 0x32, 0x8a,
+	0x18, 0xd1, 0x90, 0xcd, 0x41, 0x11, 0x2b, 0x4c, 0x44, 0x39, 0x24, 0x5d, 0xa8, 0x45, 0xd4, 0x0e,
+	0x07, 0x47, 0x34, 0x42, 0xf1, 0x18, 0x4a, 0x8d, 0xcd, 0xdf, 0x1b, 0xd0, 0xd8, 0xf7, 0xc3, 0xf8,
+	0x81, 0x1d, 0x04, 0xae, 0x77, 0x48, 0x08, 0x4c, 0xf3, 0x6d, 0x88, 0x5d, 0xf2, 0x6f, 0xf2, 0x09,
+	0xd4, 0xb8, 0x3a, 0x07, 0xfe, 0x90, 0x6f, 0xaf, 0xb5, 0xbe, 0xb0, 0x26, 0x85, 0x59, 0xdb, 0x97,
+	0x08, 0x4b, 0x91, 0x90, 0x0f, 0xa0, 0x35, 0xf0, 0xbd, 0xd8, 0x76, 0x3d, 0x1a, 0xf6, 0x03, 0xe4,
+	0xcd, 0x77, 0x5b, 0xb5, 0x9a, 0x0a, 0xca, 0x16, 0x24, 0x97, 0xa0, 0x7e, 0xe4, 0x47, 0xb1, 0xa0,
+	0x98, 0xe6, 0x14, 0x35, 0x06, 0xe0, 0xc8, 0x15, 0x98, 0xe5, 0x48, 0x37, 0xe8, 0x54, 0xb9, 0x24,
+	0x33, 0x6c, 0xb8, 0x13, 0x98, 0xbf, 0x35, 0xa0, 0xfa, 0xc0, 0xc7, 0xc5, 0x4b, 0x25, 0xcd, 0x2e,
+	0x6d, 0xc7, 0x47, 0xd2, 0x1c, 0xda, 0xd2, 0x08, 0x4c, 0x97, 0x66, 0x14, 0xc2, 0x14, 0x62, 0x69,
+	0x86, 0x44, 0x6d, 0x85, 0xd4, 0x76, 0x7c, 0x6f, 0x78, 0xc2, 0xc5, 0xaa, 0x59, 0x6a, 0xcc, 0x2c,
+	0x19, 0xd1, 0xa1, 0xeb, 0x8d, 0x5f, 0xf6, 0x43, 0x3a, 0xb4, 0x9f, 0xd1, 0x21, 0x17, 0xaf, 0x66,
+	0xb5, 0x24, 0xd8, 0x12, 0x50, 0xf3, 0x1e, 0x2c, 0xa1, 0xef, 0xf8, 0xe3, 0x70, 0x40, 0x99, 0xc3,
+	0xb9, 0x21, 0x1d, 0x51, 0x2f, 0x8e, 0xc8, 0x32, 0xcc, 0x0c, 0xdd, 0x91, 0x1b, 0x47, 0x5c, 0x6c,
+	0xc3, 0x92, 0x23, 0xb1, 0x28, 0x77, 0xcc, 0x88, 0x8b, 0x6c, 0x58, 0x6a, 0x6c, 0xfe, 0x12, 0x16,
+	0xf7, 0x7d, 0xa7, 0x67, 0x7b, 0xce, 0x33, 0xff, 0x65, 0xc2, 0x35, 0x22, 0xdf, 0x85, 0xca, 0x20,
+	0x18, 0x73, 0x3e, 0x8d, 0xf5, 0xf7, 0x94, 0x41, 0xca, 0x96, 0xb5, 0x18, 0x25, 0xf9, 0x21, 0xcc,
+	0x8c, 0xe8, 0xc8, 0x0f, 0x4f, 0xf8, 0x0a, 0xaf, 0x9c, 0x23, 0x89, 0xcd, 0xe7, 0x30, 0xcf, 0xbc,
+	0x38, 0x0a, 0xec, 0x01, 0x95, 0xae, 0x86, 0x3e, 0xcf, 0xf5, 0xe7, 0xd1, 0xf8, 0xe7, 0x7e, 0xf8,
+	0x82, 0xcb, 0x50, 0xb3, 0x1a, 0x0c, 0xb6, 0x27, 0x40, 0xe4, 0x1d, 0xa8, 0x09, 0x15, 0xbb, 0x0e,
+	0x5f, 0xae, 0x66, 0x71, 0x83, 0xee, 0xbb, 0x8e, 0x42, 0xb9, 0xc1, 0x80, 0x2b, 0x5f, 0xa2, 0x76,
+	0x82, 0x81, 0xf9, 0x2b, 0x03, 0x2e, 0xee, 0x32, 0x3d, 0xa6, 0x1b, 0xde, 0xf4, 0xbd, 0x03, 0xf7,
+	0x90, 0x7c, 0x0b, 0x9a, 0x83, 0xc3, 0xd0, 0x1f, 0x07, 0x68, 0xb4, 0x10, 0xe5, 0x93, 0x66, 0x9f,
+	0x13, 0xc0, 0x7d, 0x0e, 0x23, 0xdb, 0xb0, 0xe0, 0x25, 0xa2, 0xf6, 0x7d, 0x2e, 0x6b, 0x24, 0x37,
+	0xdb, 0x51, 0x9b, 0xcd, 0x6d, 0xc6, 0x6a, 0x7b, 0x59, 0x40, 0x64, 0xfe, 0x75, 0x1a, 0xda, 0x05,
+	0x01, 0xca, 0xdc, 0xad, 0x2b, 0x76, 0xa2, 0x9d, 0x7b, 0x35, 0x66, 0x02, 0x0f, 0xfd, 0xc3, 0xbe,
+	0x83, 0xfa, 0x1c, 0xc4, 0x4c, 0xe9, 0xc2, 0xcf, 0xe6, 0x10, 0xb8, 0x95, 0xc0, 0xc8, 0xf7, 0xa1,
+	0xe1, 0x78, 0x91, 0x12, 0x75, 0x9a, 0x8b, 0x4a, 0x94, 0xa8, 0xea, 0x70, 0x5b, 0x80, 0x64, 0x52,
+	0x3c, 0x72, 0x13, 0x9a, 0xec, 0xcc, 0xf4, 0x47, 0xe2, 0xc8, 0x46, 0xe8, 0x82, 0x15, 0x9c, 0xb6,
+	0x94, 0x9e, 0xc9, 0xf4, 0x3c, 0x5b, 0x73, 0x41, 0x3a, 0x88, 0xc8, 0x2d, 0xa8, 0x87, 0x89, 0x03,
+	0x75, 0x66, 0xf8, 0x6a, 0xef, 0x6a, 0xd3, 0x0a, 0x4e, 0x66, 0xa5, 0xe4, 0xe4, 0x0b, 0x74, 0x5d,
+	0xe6, 0xdb, 0x51, 0x67, 0x96, 0xaf, 0xf7, 0x41, 0xc9, 0x44, 0xa1, 0xab, 0xb5, 0x5d, 0x4e, 0xb7,
+	0xed, 0xc5, 0xe1, 0x89, 0x25, 0x27, 0x91, 0x5d, 0x68, 0xd8, 0x9e, 0xe7, 0xc7, 0xb6, 0xd8, 0x6a,
+	0x8d, 0xf3, 0x58, 0x9d, 0xcc, 0x63, 0x23, 0x25, 0x16, 0x8c, 0xf4, 0xe9, 0xe4, 0x07, 0x50, 0xe5,
+	0xe7, 0xad, 0x53, 0xe7, 0x9b, 0xb8, 0xac, 0xf8, 0x94, 0x7a, 0x8f, 0x25, 0x88, 0xbb, 0x37, 0xa1,
+	0xa1, 0x89, 0x46, 0xda, 0x50, 0x79, 0x41, 0x4f, 0xa4, 0x45, 0xd9, 0x27, 0x59, 0x82, 0xea, 0xb1,
+	0x3d, 0x1c, 0x27, 0xd6, 0x14, 0x83, 0x5b, 0x53, 0x3f, 0x36, 0xba, 0xb7, 0xa1, 0x9d, 0x97, 0xe8,
+	0x3c, 0xf3, 0xcd, 0x5d, 0x58, 0xd9, 0xc4, 0x30, 0x12, 0x53, 0x5d, 0xcb, 0x22, 0x13, 0x7d, 0x0f,
+	0x66, 0x06, 0x5c, 0x4c, 0x79, 0x96, 0xdf, 0x99, 0xa8, 0x14, 0x4b, 0x12, 0x9a, 0x77, 0xa0, 0x53,
+	0xe4, 0x26, 0x53, 0xd5, 0xfb, 0xd0, 0x0a, 0x7c, 0xa7, 0x1f, 0x09, 0x70, 0x1f, 0xcf, 0x9f, 0x3c,
+	0x2a, 0x81, 0xa2, 0xdd, 0x71, 0xcc, 0x2f, 0xe0, 0x62, 0x2f, 0xf6, 0x83, 0xa2, 0x34, 0x67, 0x9b,
+	0xde, 0x81, 0xe5, 0xfc, 0x74, 0xb1, 0xbc, 0xf9, 0x25, 0xac, 0x58, 0x18, 0x38, 0x8e, 0xe9, 0xeb,
+	0xb2, 0xee, 0x42, 0xa7, 0xc8, 0x20, 0x65, 0x9e, 0x42, 0x7b, 0x68, 0x8c, 0x71, 0x74, 0x3e, 0xe6,
+	0x1f, 0xea, 0x0c, 0x64, 0xac, 0x12, 0x7c, 0x48, 0x0b, 0xa6, 0x30, 0xdb, 0x88, 0x49, 0xf8, 0x65,
+	0x3e, 0x85, 0xba, 0x0a, 0x15, 0x2c, 0xb9, 0xea, 0xc1, 0x0e, 0x93, 0xab, 0x1c, 0x92, 0x75, 0x98,
+	0x3d, 0x6b, 0xa4, 0x49, 0x08, 0xcd, 0xfb, 0x85, 0x28, 0x27, 0x65, 0x58, 0x07, 0x50, 0xd1, 0x28,
+	0x92, 0xee, 0x40, 0x8a, 0xfc, 0x2c, 0x8d, 0xca, 0xfc, 0x77, 0x45, 0x8f, 0x56, 0xda, 0x66, 0x1c,
+	0xb5, 0x19, 0x47, 0x45, 0xaf, 0x29, 0x2d, 0x7a, 0xad, 0x41, 0x35, 0x42, 0x6a, 0xca, 0x23, 0x53,
+	0x4b, 0x93, 0x5b, 0x72, 0xfb, 0x4a, 0x70, 0xa3, 0x96, 0x20, 0x23, 0xef, 0x01, 0x0c, 0xb8, 0xd3,
+	0x39, 0x7d, 0x5b, 0x64, 0xec, 0x8a, 0x55, 0x97, 0x90, 0x8d, 0x18, 0x63, 0x8b, 0x52, 0x51, 0x95,
+	0x0b, 0x7e, 0xb5, 0xc4, 0x8f, 0x33, 0x2a, 0x4f, 0x95, 0xa8, 0x8e, 0xf3, 0xcc, 0xe9, 0xc7, 0x59,
+	0xce, 0x13, 0xc4, 0x67, 0x8a, 0x48, 0x62, 0xc6, 0x9b, 0x45, 0x24, 0xc9, 0xe3, 0xd4, 0x88, 0xf4,
+	0x36, 0x63, 0xcb, 0x03, 0xe8, 0x14, 0x4f, 0x85, 0x8c, 0x06, 0x18, 0x5c, 0x22, 0x0e, 0x39, 0x25,
+	0xb8, 0xc8, 0x29, 0x92, 0xd0, 0xfc, 0x97, 0xa1, 0x3b, 0xd4, 0x4f, 0xdc, 0x61, 0x4c, 0xc3, 0xd2,
+	0xf4, 0x27, 0x9c, 0x6c, 0x4a, 0x39, 0xd9, 0x79, 0x1d, 0xaa, 0x07, 0x2d, 0x6e, 0x8a, 0x3e, 0x16,
+	0x4f, 0x3c, 0x21, 0xa2, 0x53, 0x31, 0x1b, 0x7c, 0x5c, 0x22, 0xa3, 0x10, 0x43, 0xd8, 0xb1, 0x27,
+	0xc9, 0x85, 0x15, 0x9a, 0x43, 0x1d, 0xd6, 0xbd, 0x03, 0xa4, 0x48, 0x74, 0x2e, 0x75, 0xde, 0x63,
+	0xa7, 0x93, 0xd5, 0xa1, 0x25, 0x81, 0xfa, 0x80, 0x8b, 0x71, 0x8a, 0x2e, 0x85, 0x9c, 0x96, 0x24,
+	0x34, 0xff, 0x61, 0x00, 0xa4, 0xc8, 0xb7, 0x71, 0x2c, 0x3f, 0x55, 0x87, 0x44, 0x94, 0x09, 0x57,
+	0x4a, 0x84, 0x2e, 0x3b, 0x1e, 0x6f, 0xe0, 0xd0, 0xe6, 0x26, 0x2c, 0xe7, 0x35, 0x28, 0xdd, 0xf1,
+	0x43, 0xa8, 0xba, 0x31, 0x1d, 0x89, 0x16, 0xa5, 0xb1, 0xbe, 0x58, 0x56, 0x7c, 0x08, 0x0a, 0xf3,
+	0x1a, 0xd4, 0x77, 0x46, 0xf6, 0x21, 0xed, 0x05, 0x74, 0xc0, 0xd6, 0x72, 0xd9, 0x40, 0xae, 0x2f,
+	0x06, 0xe6, 0x3a, 0xd4, 0xee, 0xd3, 0x93, 0x27, 0x6c, 0xdd, 0xb3, 0xca, 0x67, 0xfe, 0xd9, 0x80,
+	0x15, 0x1e, 0x55, 0x36, 0x93, 0x96, 0x20, 0x2d, 0xa9, 0x99, 0x2a, 0x83, 0x71, 0x3f, 0xa0, 0xa1,
+	0xeb, 0x0b, 0x33, 0x31, 0x55, 0x06, 0xe3, 0x7d, 0x0e, 0x60, 0x6d, 0x03, 0x43, 0x7f, 0x33, 0xc6,
+	0xa3, 0xca, 0x99, 0x56, 0xac, 0x1a, 0x02, 0x7e, 0xca, 0xc6, 0xc9, 0xdc, 0xe8, 0x08, 0x4b, 0xd1,
+	0x88, 0xdb, 0x4e, 0xcc, 0xed, 0x71, 0x00, 0xfa, 0xce, 0x45, 0x51, 0x4f, 0xf7, 0x79, 0xc5, 0xdf,
+	0x77, 0xbd, 0xfe, 0xb3, 0x93, 0x98, 0x46, 0xd2, 0x60, 0x44, 0x20, 0x77, 0x19, 0x6e, 0xc7, 0xfb,
+	0x8a, 0x61, 0x88, 0x09, 0x4d, 0xdf, 0x1f, 0xf5, 0xa3, 0x81, 0x1f, 0x62, 0x3f, 0xe8, 0x3c, 0xe7,
+	0x61, 0xb5, 0x62, 0x35, 0x10, 0xd8, 0x63, 0xb0, 0x0d, 0xe7, 0xb9, 0x69, 0x43, 0xb3, 0xb7, 0xcd,
+	0xb7, 0x23, 0x4b, 0x73, 0xf4, 0xa8, 0x71, 0x24, 0x3d, 0x14, 0x3d, 0x8a, 0x7d, 0x33, 0x58, 0xe8,
+	0x0f, 0x95, 0x97, 0xb1, 0x6f, 0x06, 0x8b, 0x4f, 0x02, 0x2a, 0xab, 0x52, 0xfe, 0xcd, 0x14, 0x36,
+	0xa4, 0xc7, 0xd8, 0xd3, 0x88, 0x86, 0x53, 0x0c, 0x4c, 0x07, 0x60, 0xd3, 0x0e, 0xec, 0x67, 0xee,
+	0xd0, 0x8d, 0x4f, 0xd0, 0x80, 0x6d, 0xdb, 0x71, 0xfa, 0x83, 0x04, 0xe2, 0xd2, 0xa4, 0xdd, 0x9c,
+	0x47, 0xf8, 0xa6, 0x06, 0x26, 0x1f, 0xc1, 0x82, 0x13, 0xfa, 0x41, 0x96, 0x56, 0xf4, 0x9f, 0x6d,
+	0x86, 0xd0, 0x89, 0xcd, 0x7f, 0x1a, 0xb0, 0x94, 0x35, 0x8b, 0xac, 0xbb, 0x6f, 0xeb, 0x25, 0xab,
+	0x91, 0x4b, 0x2c, 0x13, 0x0c, 0xa9, 0x97, 0xad, 0x9f, 0xc2, 0x5c, 0x4e, 0x00, 0x23, 0xe3, 0x78,
+	0xe9, 0xde, 0xac, 0x0c, 0x21, 0xf9, 0x32, 0xed, 0xf5, 0x92, 0x04, 0x5f, 0xe1, 0x73, 0x97, 0xd5,
+	0xdc, 0x8c, 0xea, 0x55, 0x0f, 0x98, 0xd4, 0xe9, 0xdf, 0x96, 0xa6, 0xc8, 0x57, 0xf5, 0x7c, 0xce,
+	0x63, 0xc4, 0x08, 0xf3, 0x98, 0x5f, 0x43, 0x5d, 0x81, 0x98, 0x1b, 0x8f, 0xdd, 0xc4, 0xf7, 0xd8,
+	0x27, 0x83, 0x1c, 0xca, 0x30, 0x8b, 0x10, 0xfc, 0x64, 0x5d, 0x28, 0xea, 0xda, 0x65, 0xab, 0xd8,
+	0xc3, 0x3e, 0x42, 0x98, 0x64, 0x15, 0xc4, 0xb6, 0x52, 0xf0, 0x5d, 0x84, 0x9a, 0x7f, 0xab, 0xc2,
+	0x7c, 0x5e, 0x9f, 0x65, 0x81, 0xfc, 0x7a, 0x72, 0xba, 0xa6, 0x72, 0xa2, 0xaa, 0x03, 0x28, 0x4f,
+	0x1c, 0xab, 0x83, 0x06, 0xfe, 0x68, 0x84, 0x27, 0x95, 0x2f, 0x89, 0x75, 0x90, 0x1c, 0x32, 0xbe,
+	0x76, 0x78, 0x18, 0xf1, 0x10, 0x8e, 0x7c, 0xd9, 0x37, 0xb9, 0x02, 0x0d, 0x96, 0xde, 0xb1, 0xf5,
+	0x60, 0x7d, 0x90, 0xec, 0xe4, 0x41, 0x82, 0xb0, 0x0b, 0xc2, 0x7e, 0x7d, 0x9a, 0x7a, 0xc7, 0xac,
+	0x15, 0x61, 0xd1, 0x20, 0xbd, 0x55, 0x48, 0x4e, 0xb5, 0xc5, 0xd1, 0xa8, 0xc9, 0x99, 0x11, 0xeb,
+	0xf9, 0x93, 0x44, 0xdf, 0x52, 0x84, 0xfc, 0x2a, 0xc0, 0x92, 0x58, 0xf2, 0xb9, 0x8a, 0x75, 0x22,
+	0x99, 0xbf, 0x9f, 0x5a, 0x39, 0xab, 0x85, 0xd2, 0x7a, 0xe0, 0x7e, 0xb6, 0x1e, 0xa8, 0x73, 0x16,
+	0x1f, 0x4e, 0x64, 0x71, 0x7a, 0x83, 0x72, 0x19, 0x20, 0x08, 0xdd, 0x63, 0x77, 0x48, 0x0f, 0xa9,
+	0xd3, 0x01, 0xde, 0xe6, 0x6a, 0x10, 0x7e, 0x27, 0x24, 0x6f, 0x15, 0xfa, 0xa1, 0xef, 0xc7, 0x07,
+	0x51, 0xa7, 0x21, 0x6e, 0x12, 0x12, 0xb0, 0xc5, 0xa1, 0xac, 0x5b, 0x66, 0x7d, 0x24, 0xbf, 0xaa,
+	0x98, 0x13, 0xa5, 0x27, 0x8e, 0xf9, 0x4d, 0xc5, 0x12, 0xcb, 0x14, 0x8e, 0xeb, 0x75, 0x9a, 0x7c,
+	0xa6, 0x18, 0xb0, 0x40, 0xc4, 0x3f, 0xfa, 0xbe, 0x37, 0xa0, 0x9d, 0x16, 0x47, 0xd5, 0x39, 0xe4,
+	0x21, 0x02, 0x98, 0x3b, 0xc5, 0xf1, 0x49, 0x67, 0x9e, 0xc3, 0xd9, 0x27, 0x36, 0xa1, 0xb2, 0xf8,
+	0x6a, 0xe7, 0xae, 0x05, 0xca, 0xce, 0xe3, 0xff, 0x41, 0x2b, 0xf5, 0x07, 0x03, 0x96, 0x45, 0xf7,
+	0xa3, 0x9d, 0xfc, 0x73, 0x34, 0x01, 0xe4, 0x86, 0x6a, 0xb8, 0xf2, 0x15, 0x7b, 0x7e, 0xb3, 0x92,
+	0x8e, 0xdc, 0x81, 0x56, 0xc2, 0x53, 0xce, 0xac, 0xbc, 0xaa, 0x55, 0x6b, 0x46, 0xfa, 0xd0, 0xfc,
+	0x3c, 0xe9, 0xff, 0xf4, 0x68, 0x25, 0x72, 0xe2, 0x35, 0x8c, 0x50, 0xea, 0xd2, 0x4a, 0x89, 0xdc,
+	0x50, 0x30, 0x6c, 0x5b, 0x6e, 0xb1, 0x6e, 0xcd, 0x0e, 0xe3, 0xc2, 0x86, 0xcf, 0x30, 0x97, 0xb7,
+	0x6a, 0xd9, 0xb9, 0xb2, 0x9b, 0xea, 0xc1, 0x12, 0x6b, 0xe2, 0x5e, 0x83, 0x29, 0x8b, 0x03, 0x6c,
+	0xdb, 0xfe, 0x38, 0x96, 0x81, 0x29, 0x19, 0x9a, 0x2b, 0xa2, 0xb1, 0x2c, 0xae, 0xf6, 0x19, 0x2c,
+	0x8b, 0xbe, 0xee, 0x75, 0x36, 0xf1, 0x4e, 0xd2, 0x55, 0x16, 0xf9, 0xfe, 0x66, 0x4a, 0x0b, 0x72,
+	0xe7, 0xa8, 0x56, 0x3f, 0xc9, 0xd6, 0x59, 0x2b, 0x45, 0x27, 0xc8, 0x94, 0x59, 0x45, 0xd7, 0x9a,
+	0x2e, 0x71, 0x2d, 0xab, 0x50, 0xd2, 0x8a, 0xaa, 0xeb, 0xa3, 0x22, 0xf7, 0xff, 0x61, 0x45, 0xbb,
+	0x23, 0x2a, 0x5a, 0xb5, 0xb4, 0x6a, 0x9a, 0x6f, 0xe4, 0x2a, 0xda, 0xce, 0x24, 0x31, 0x55, 0x41,
+	0xfb, 0xeb, 0x29, 0xa8, 0x2b, 0xdc, 0x99, 0xea, 0x59, 0x95, 0x5c, 0x2a, 0xaf, 0x4a, 0x2e, 0x58,
+	0x5f, 0xf1, 0x8f, 0x7e, 0x48, 0x0f, 0xa4, 0x76, 0x6b, 0x1c, 0x60, 0xd1, 0x83, 0xd4, 0x5c, 0xd5,
+	0x33, 0x99, 0xeb, 0x47, 0x2a, 0x15, 0x88, 0xdc, 0x72, 0xb9, 0x48, 0xff, 0xdf, 0xae, 0x7a, 0x77,
+	0x45, 0xd5, 0xab, 0x6b, 0x59, 0x9e, 0x70, 0x6c, 0xeb, 0x95, 0x33, 0x27, 0xa5, 0x2f, 0x29, 0x0a,
+	0x64, 0x69, 0x54, 0xec, 0xb8, 0x64, 0x76, 0x96, 0xde, 0x74, 0x9c, 0xe1, 0xb8, 0xfc, 0x7d, 0x5a,
+	0x3b, 0x13, 0xe7, 0xb8, 0x12, 0x38, 0xe7, 0x99, 0x78, 0x45, 0xeb, 0xc1, 0x33, 0x11, 0x46, 0x1e,
+	0x81, 0x16, 0xd5, 0x6b, 0x5d, 0x42, 0x10, 0x8d, 0xd5, 0xc1, 0x81, 0xeb, 0xb9, 0xd1, 0x91, 0xc0,
+	0xcf, 0x70, 0x3c, 0x24, 0xa0, 0x0d, 0xfe, 0x42, 0x40, 0x5f, 0x62, 0xad, 0x3c, 0xf0, 0x1d, 0x8a,
+	0x99, 0x9f, 0xbf, 0x10, 0x30, 0xc0, 0x26, 0x8e, 0x53, 0xb7, 0xaa, 0x9d, 0xcb, 0xad, 0xea, 0x39,
+	0xb7, 0x5a, 0x86, 0x19, 0x94, 0x37, 0xf2, 0x3d, 0x9e, 0xa3, 0xeb, 0x96, 0x1c, 0x69, 0xa5, 0x44,
+	0x63, 0x52, 0x29, 0x71, 0xca, 0xd5, 0x42, 0xae, 0x94, 0x98, 0x9b, 0x54, 0x4a, 0x9c, 0xe5, 0x66,
+	0x41, 0xab, 0x7e, 0x9a, 0xa7, 0x55, 0x3f, 0x6f, 0x33, 0x25, 0xdf, 0xc7, 0xec, 0x96, 0x77, 0x56,
+	0xe9, 0xfb, 0x37, 0x72, 0x17, 0x10, 0x9d, 0x49, 0x5a, 0x50, 0xf7, 0x0f, 0xcf, 0xa1, 0xb1, 0xfd,
+	0x12, 0xcd, 0x77, 0xf6, 0x6c, 0x84, 0xa2, 0x0e, 0x46, 0x8e, 0xec, 0x2d, 0xd8, 0x67, 0x52, 0xe5,
+	0x54, 0xd2, 0x2a, 0x47, 0x15, 0x4b, 0xcc, 0x4d, 0xe7, 0x64, 0xb1, 0x64, 0xde, 0x86, 0x39, 0xb1,
+	0x96, 0x94, 0x76, 0x99, 0x49, 0xeb, 0xb0, 0xb4, 0x66, 0x70, 0x32, 0x39, 0x92, 0x70, 0x1a, 0x86,
+	0x7c, 0xef, 0x02, 0x8e, 0x23, 0xf3, 0x53, 0x68, 0x70, 0x7f, 0x93, 0x79, 0xe7, 0xba, 0xde, 0xa6,
+	0x9e, 0xe6, 0x94, 0xe6, 0x06, 0x2c, 0xb0, 0x60, 0xc1, 0xe1, 0xea, 0x64, 0x7f, 0x9c, 0x0b, 0xc7,
+	0x4b, 0xd9, 0xf9, 0xb9, 0x50, 0xfc, 0x02, 0xaa, 0x1c, 0x5c, 0x38, 0xd9, 0x97, 0x58, 0xcb, 0x14,
+	0xf8, 0xfd, 0xd8, 0x3e, 0x54, 0x0f, 0x7e, 0x0c, 0xf0, 0x08, 0xc7, 0xfc, 0xbd, 0x92, 0x21, 0x1d,
+	0xf7, 0x90, 0xbf, 0x36, 0x89, 0x32, 0xbe, 0xc1, 0x60, 0x5b, 0x02, 0xc4, 0x22, 0x43, 0xe4, 0xfe,
+	0x82, 0x72, 0x4d, 0x4d, 0x5b, 0xfc, 0x1b, 0xeb, 0x17, 0xa2, 0xcb, 0x2b, 0xd5, 0x85, 0xae, 0xc9,
+	0xb7, 0x93, 0x04, 0xb5, 0x56, 0x56, 0x60, 0x4b, 0x62, 0x51, 0xcd, 0x44, 0x68, 0x20, 0x13, 0xc8,
+	0xce, 0xae, 0xad, 0xcf, 0x60, 0x31, 0x33, 0x5f, 0x5d, 0x75, 0x67, 0x18, 0xe4, 0x57, 0x97, 0x93,
+	0xff, 0x62, 0x00, 0x6c, 0x8c, 0xe3, 0x23, 0xd9, 0x00, 0x75, 0xa1, 0xc6, 0xda, 0x2e, 0xad, 0x3e,
+	0x50, 0x63, 0x86, 0x0b, 0xec, 0x28, 0xc2, 0x0e, 0x25, 0xa9, 0x14, 0xd4, 0x98, 0x37, 0x38, 0x63,
+	0xf5, 0x5e, 0xc8, 0xbf, 0xd9, 0x7b, 0xa3, 0x78, 0x64, 0xc5, 0xfe, 0xdc, 0xc1, 0x9e, 0x33, 0x92,
+	0x69, 0xab, 0x29, 0xa0, 0x1b, 0x02, 0xc8, 0xc8, 0x5c, 0x87, 0xa2, 0x68, 0xf1, 0x49, 0x3f, 0xf6,
+	0x5f, 0x50, 0x4f, 0xb6, 0x42, 0xcd, 0x04, 0xfa, 0x88, 0x01, 0x19, 0x59, 0x48, 0x0f, 0x51, 0xcb,
+	0x61, 0x42, 0x36, 0x23, 0xc8, 0x12, 0x28, 0x27, 0x63, 0xef, 0xd3, 0xed, 0xfd, 0xf1, 0x70, 0x28,
+	0x36, 0x79, 0x5e, 0x5d, 0x62, 0xe7, 0x21, 0xf6, 0x91, 0x6f, 0x84, 0x53, 0x15, 0xc9, 0xcd, 0xbd,
+	0x79, 0xd1, 0xbb, 0x08, 0x0b, 0x9a, 0xa0, 0xb2, 0x5e, 0x43, 0x5f, 0x10, 0xa5, 0xdc, 0xeb, 0xc9,
+	0x6f, 0x5e, 0x84, 0xc5, 0xcc, 0x7c, 0xc1, 0x76, 0xf5, 0x5d, 0xa8, 0x25, 0x6f, 0xd1, 0x64, 0x16,
+	0x2a, 0x8f, 0x36, 0xf7, 0xdb, 0x17, 0xd8, 0xc7, 0xe3, 0xad, 0xfd, 0xb6, 0xb1, 0xba, 0x0a, 0xf3,
+	0xb9, 0xeb, 0x33, 0x52, 0x87, 0xaa, 0xb5, 0xbd, 0xb1, 0xf5, 0x14, 0xc9, 0xe6, 0xa0, 0xb6, 0xf7,
+	0xf0, 0x91, 0x18, 0x19, 0xab, 0x9b, 0xd0, 0xca, 0xa6, 0x3b, 0xd2, 0x80, 0xd9, 0x4d, 0xc4, 0x3e,
+	0xda, 0xde, 0x42, 0x62, 0x1c, 0x58, 0x8f, 0xf7, 0xf6, 0x76, 0xf6, 0xee, 0xb6, 0x0d, 0x02, 0x30,
+	0xb3, 0xfd, 0xf5, 0x0e, 0x43, 0x4c, 0x31, 0xc4, 0xe3, 0xbd, 0xfb, 0x7b, 0x0f, 0x7f, 0xb6, 0xd7,
+	0xae, 0xac, 0xff, 0xa9, 0x06, 0x2d, 0x4b, 0x6c, 0xa1, 0x87, 0xbe, 0xe0, 0x62, 0xe7, 0x75, 0x1b,
+	0x66, 0x93, 0x87, 0xfe, 0x34, 0xb1, 0x66, 0xff, 0x4a, 0xe8, 0x76, 0x8a, 0x08, 0xa9, 0xb6, 0x0b,
+	0xe4, 0x29, 0xb4, 0xf3, 0x8f, 0x3e, 0x24, 0xbd, 0x0a, 0x99, 0xf0, 0xba, 0xd4, 0xbd, 0x76, 0x0a,
+	0x85, 0x62, 0xdd, 0x83, 0x56, 0xf6, 0x39, 0x87, 0xa4, 0xf5, 0x52, 0xe9, 0x33, 0x51, 0xf7, 0xca,
+	0x44, 0xbc, 0x2e, 0x6f, 0xfe, 0x21, 0x47, 0x93, 0x77, 0xc2, 0x23, 0x91, 0x26, 0xef, 0xc4, 0x57,
+	0x20, 0xce, 0xba, 0xf0, 0xe4, 0x71, 0x75, 0xf2, 0xcd, 0x76, 0x81, 0xf5, 0xa4, 0xeb, 0x72, 0xa1,
+	0x8a, 0xec, 0xdd, 0x25, 0xd1, 0x5f, 0x23, 0x4a, 0xae, 0x85, 0x35, 0x55, 0x94, 0x5f, 0x7a, 0x22,
+	0xd3, 0x27, 0x58, 0x8e, 0x65, 0xbb, 0x3f, 0x72, 0x25, 0x67, 0x97, 0x7c, 0x57, 0xd4, 0xbd, 0x3a,
+	0x99, 0x20, 0x6b, 0x37, 0xbd, 0xb7, 0xcb, 0xd8, 0xad, 0xa4, 0x61, 0xcc, 0xd8, 0xad, 0xb4, 0x29,
+	0xbc, 0x40, 0xf6, 0xa1, 0x99, 0xe9, 0xe0, 0xc8, 0x7b, 0x19, 0x5b, 0x17, 0x58, 0x5e, 0x9e, 0x84,
+	0xd6, 0xb7, 0x9f, 0xeb, 0xde, 0xb4, 0xed, 0x97, 0x37, 0x85, 0xdd, 0xab, 0x93, 0x09, 0xf2, 0xb6,
+	0x4a, 0x2b, 0xee, 0x9c, 0xad, 0x0a, 0x0d, 0x4f, 0xce, 0x56, 0xc5, 0x52, 0x5d, 0xda, 0x2a, 0x57,
+	0x3a, 0x5f, 0x99, 0x58, 0xb3, 0x14, 0x6d, 0x55, 0x5e, 0x06, 0x21, 0xdf, 0x9b, 0x30, 0xcd, 0x4a,
+	0x0d, 0x92, 0x26, 0x75, 0xad, 0xca, 0xe9, 0x5e, 0xcc, 0x41, 0x93, 0x69, 0xd7, 0x8d, 0x1b, 0xc6,
+	0xfa, 0x1f, 0xa7, 0x60, 0x4e, 0xc4, 0x41, 0x19, 0x4a, 0xee, 0x02, 0xa4, 0xd9, 0x98, 0x74, 0x33,
+	0x9b, 0xca, 0x94, 0x14, 0xdd, 0x4b, 0xa5, 0x38, 0x25, 0xd4, 0x3d, 0x59, 0xbf, 0xc8, 0x8d, 0x5e,
+	0xca, 0x85, 0xdd, 0xcc, 0x26, 0xdf, 0x2d, 0x47, 0x2a, 0x5e, 0x5b, 0x50, 0x57, 0xd1, 0x9e, 0x68,
+	0x49, 0x22, 0x97, 0xaa, 0xba, 0xdd, 0x32, 0x94, 0x2e, 0x91, 0x16, 0xde, 0x35, 0x89, 0x8a, 0x49,
+	0x43, 0x93, 0xa8, 0x24, 0x23, 0x98, 0x17, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xd8, 0xd5,
+	0x8a, 0x0a, 0x26, 0x00, 0x00,
 }
diff --git a/pkg/storage/etcd3/compact.go b/pkg/storage/etcd3/compact.go
index ad1ac1ac2a2..d6d71f03d73 100644
--- a/pkg/storage/etcd3/compact.go
+++ b/pkg/storage/etcd3/compact.go
@@ -153,7 +153,7 @@ func compact(ctx context.Context, client *clientv3.Client, t, rev int64) (int64,
 		// We don't compact on bootstrap.
 		return curTime, curRev, nil
 	}
-	if err = client.Compact(ctx, rev); err != nil {
+	if _, err = client.Compact(ctx, rev); err != nil {
 		return curTime, curRev, err
 	}
 	glog.Infof("etcd: compacted rev (%d), endpoints (%v)", rev, client.Endpoints())
diff --git a/pkg/storage/etcd3/compact_test.go b/pkg/storage/etcd3/compact_test.go
index d6fa099d1f5..021b8c451aa 100644
--- a/pkg/storage/etcd3/compact_test.go
+++ b/pkg/storage/etcd3/compact_test.go
@@ -36,14 +36,19 @@ func TestCompact(t *testing.T) {
 		t.Fatalf("Put failed: %v", err)
 	}
 
-	_, _, err = compact(ctx, client, 0, putResp.Header.Revision)
+	putResp1, err := client.Put(ctx, "/somekey", "data2")
+	if err != nil {
+		t.Fatalf("Put failed: %v", err)
+	}
+
+	_, _, err = compact(ctx, client, 0, putResp1.Header.Revision)
 	if err != nil {
 		t.Fatalf("compact failed: %v", err)
 	}
 
-	_, err = client.Get(ctx, "/somekey", clientv3.WithRev(putResp.Header.Revision))
+	obj, err := client.Get(ctx, "/somekey", clientv3.WithRev(putResp.Header.Revision))
 	if err != etcdrpc.ErrCompacted {
-		t.Errorf("Expecting ErrCompacted, but get=%v", err)
+		t.Errorf("Expecting ErrCompacted, but get=%v err=%v", obj, err)
 	}
 }
 
diff --git a/pkg/storage/etcd3/event.go b/pkg/storage/etcd3/event.go
index 93f994346be..585c371b5dc 100644
--- a/pkg/storage/etcd3/event.go
+++ b/pkg/storage/etcd3/event.go
@@ -18,7 +18,7 @@ package etcd3
 
 import (
 	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/storage/storagepb"
+	"github.com/coreos/etcd/mvcc/mvccpb"
 )
 
 type event struct {
@@ -29,7 +29,7 @@ type event struct {
 	isCreated bool
 }
 
-func parseKV(kv *storagepb.KeyValue) *event {
+func parseKV(kv *mvccpb.KeyValue) *event {
 	return &event{
 		key:       string(kv.Key),
 		value:     kv.Value,