builder_config: Cleanup deprecated fields.

Remove deprecated fields from BuilderConfig.Build.
Start renaming install_packages_conf to install_packages.

BUG=chromium:1038975
TEST=generate.sh

Change-Id: I39ad148ef62b9a193ce47bbff88ec863220e9485
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2032438
Reviewed-by: David Burger <dburger@chromium.org>
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
Tested-by: LaMont Jones <lamontjones@chromium.org>
diff --git a/descpb.bin b/descpb.bin
index 673d5c3..e50c35d 100644
--- a/descpb.bin
+++ b/descpb.bin
Binary files differ
diff --git a/go/chromiumos/builder_config.pb.go b/go/chromiumos/builder_config.pb.go
index 9988c26..77d4288 100644
--- a/go/chromiumos/builder_config.pb.go
+++ b/go/chromiumos/builder_config.pb.go
@@ -785,10 +785,6 @@
 }
 
 type BuilderConfig_Artifacts_PublishInfo struct {
-	// Google storage bucket to publish these artifact types to.
-	// TODO(crbug/1019868): remove this after uses have migrated.
-	// DEPRECTATED: use publish_gs_location.
-	PublishGsBucket string `protobuf:"bytes,1,opt,name=publish_gs_bucket,json=publishGsBucket,proto3" json:"publish_gs_bucket,omitempty"`
 	// Artifact types to publish to this bucket.
 	PublishTypes []BuilderConfig_Artifacts_ArtifactTypes `protobuf:"varint,2,rep,packed,name=publish_types,json=publishTypes,proto3,enum=chromiumos.BuilderConfig_Artifacts_ArtifactTypes" json:"publish_types,omitempty"`
 	// GS location in which to publish artifacts ("gs://" is prepended).
@@ -830,13 +826,6 @@
 
 var xxx_messageInfo_BuilderConfig_Artifacts_PublishInfo proto.InternalMessageInfo
 
-func (m *BuilderConfig_Artifacts_PublishInfo) GetPublishGsBucket() string {
-	if m != nil {
-		return m.PublishGsBucket
-	}
-	return ""
-}
-
 func (m *BuilderConfig_Artifacts_PublishInfo) GetPublishTypes() []BuilderConfig_Artifacts_ArtifactTypes {
 	if m != nil {
 		return m.PublishTypes
@@ -950,35 +939,14 @@
 	// USE flags to use with the build.
 	UseFlags       []*UseFlag                          `protobuf:"bytes,1,rep,name=use_flags,json=useFlags,proto3" json:"use_flags,omitempty"`
 	PortageProfile *BuilderConfig_Build_PortageProfile `protobuf:"bytes,2,opt,name=portage_profile,json=portageProfile,proto3" json:"portage_profile,omitempty"`
-	// Image types to build.
-	// DEPRECATED: Use steps.build_images.image_types.
-	ImageTypes []ImageType `protobuf:"varint,3,rep,packed,name=image_types,json=imageTypes,proto3,enum=chromiumos.ImageType" json:"image_types,omitempty"`
-	// Controls the running of the install packages step.
-	// DEPRECATED: Use steps.install_packages_conf.run_spec.
-	InstallPackages BuilderConfig_RunSpec `protobuf:"varint,4,opt,name=install_packages,json=installPackages,proto3,enum=chromiumos.BuilderConfig_RunSpec" json:"install_packages,omitempty"`
-	// Compile toolchain from source (true), or use bin packages (false).  This
-	// applies to the install toolchain step only.
-	// DEPRECATED: Use steps.install_toolchain.compile_source.
-	CompileToolchain bool `protobuf:"varint,5,opt,name=compile_toolchain,json=compileToolchain,proto3" json:"compile_toolchain,omitempty"`
 	// Whether to apply gerrit changes, if any. Use case is to build without
 	// changes after failure to identify the changes as the culprit.
-	ApplyGerritChanges bool `protobuf:"varint,6,opt,name=apply_gerrit_changes,json=applyGerritChanges,proto3" json:"apply_gerrit_changes,omitempty"`
-	// Packages to build, or empty to build all packages.
-	// DEPRECATED: Use steps.install_packages_conf.packages.
-	Packages []*PackageInfo `protobuf:"bytes,7,rep,name=packages,proto3" json:"packages,omitempty"`
-	// Build packages from source (true), or use bin packages (false).  This
-	// applies to the install packages step only.
-	// DEPRECATED: Use steps.install_packages_conf.compile_source.
-	CompileSource bool `protobuf:"varint,10,opt,name=compile_source,json=compileSource,proto3" json:"compile_source,omitempty"`
-	// Compile sdk packages from source (true) or use prebuilts (false).  This
-	// applies to the update sdk step only.
-	// DEPRECATED: Use steps.sdk_update.compile_source.
-	CompileUpdateSdk bool                                  `protobuf:"varint,11,opt,name=compile_update_sdk,json=compileUpdateSdk,proto3" json:"compile_update_sdk,omitempty"`
-	SdkUpdate        *BuilderConfig_Build_SdkUpdate        `protobuf:"bytes,12,opt,name=sdk_update,json=sdkUpdate,proto3" json:"sdk_update,omitempty"`
-	InstallToolchain *BuilderConfig_Build_InstallToolchain `protobuf:"bytes,13,opt,name=install_toolchain,json=installToolchain,proto3" json:"install_toolchain,omitempty"`
-	// TODO(crbug/1038975): rename this to install_packages once the RunSpec is
-	// gone above.
+	ApplyGerritChanges bool                                  `protobuf:"varint,6,opt,name=apply_gerrit_changes,json=applyGerritChanges,proto3" json:"apply_gerrit_changes,omitempty"`
+	SdkUpdate          *BuilderConfig_Build_SdkUpdate        `protobuf:"bytes,12,opt,name=sdk_update,json=sdkUpdate,proto3" json:"sdk_update,omitempty"`
+	InstallToolchain   *BuilderConfig_Build_InstallToolchain `protobuf:"bytes,13,opt,name=install_toolchain,json=installToolchain,proto3" json:"install_toolchain,omitempty"`
+	// TODO(crbug:1038975): drop install_packages_conf
 	InstallPackagesConf  *BuilderConfig_Build_InstallPackages `protobuf:"bytes,14,opt,name=install_packages_conf,json=installPackagesConf,proto3" json:"install_packages_conf,omitempty"`
+	InstallPackages      *BuilderConfig_Build_InstallPackages `protobuf:"bytes,16,opt,name=install_packages,json=installPackages,proto3" json:"install_packages,omitempty"`
 	BuildImages          *BuilderConfig_Build_BuildImages     `protobuf:"bytes,15,opt,name=build_images,json=buildImages,proto3" json:"build_images,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                             `json:"-"`
 	XXX_unrecognized     []byte                               `json:"-"`
@@ -1024,27 +992,6 @@
 	return nil
 }
 
-func (m *BuilderConfig_Build) GetImageTypes() []ImageType {
-	if m != nil {
-		return m.ImageTypes
-	}
-	return nil
-}
-
-func (m *BuilderConfig_Build) GetInstallPackages() BuilderConfig_RunSpec {
-	if m != nil {
-		return m.InstallPackages
-	}
-	return BuilderConfig_RUN_SPEC_UNSPECIFIED
-}
-
-func (m *BuilderConfig_Build) GetCompileToolchain() bool {
-	if m != nil {
-		return m.CompileToolchain
-	}
-	return false
-}
-
 func (m *BuilderConfig_Build) GetApplyGerritChanges() bool {
 	if m != nil {
 		return m.ApplyGerritChanges
@@ -1052,27 +999,6 @@
 	return false
 }
 
-func (m *BuilderConfig_Build) GetPackages() []*PackageInfo {
-	if m != nil {
-		return m.Packages
-	}
-	return nil
-}
-
-func (m *BuilderConfig_Build) GetCompileSource() bool {
-	if m != nil {
-		return m.CompileSource
-	}
-	return false
-}
-
-func (m *BuilderConfig_Build) GetCompileUpdateSdk() bool {
-	if m != nil {
-		return m.CompileUpdateSdk
-	}
-	return false
-}
-
 func (m *BuilderConfig_Build) GetSdkUpdate() *BuilderConfig_Build_SdkUpdate {
 	if m != nil {
 		return m.SdkUpdate
@@ -1094,6 +1020,13 @@
 	return nil
 }
 
+func (m *BuilderConfig_Build) GetInstallPackages() *BuilderConfig_Build_InstallPackages {
+	if m != nil {
+		return m.InstallPackages
+	}
+	return nil
+}
+
 func (m *BuilderConfig_Build) GetBuildImages() *BuilderConfig_Build_BuildImages {
 	if m != nil {
 		return m.BuildImages
@@ -1141,11 +1074,6 @@
 	return ""
 }
 
-// Below here are configuration specifications for the steps that call the
-// Build API endpoints.
-//
-// TODO(crbug/1038975): remove DEPRECATED fields above.
-//
 // Controls for the call to SdkService.Update.
 type BuilderConfig_Build_SdkUpdate struct {
 	// Whether to compile from source (vs using prebuilts when able.)
@@ -1465,129 +1393,125 @@
 func init() { proto.RegisterFile("chromiumos/builder_config.proto", fileDescriptor_6fe67302c16003fb) }
 
 var fileDescriptor_6fe67302c16003fb = []byte{
-	// 1978 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x4b, 0x73, 0xdb, 0xc8,
-	0xf1, 0xff, 0xf3, 0x21, 0x89, 0x6c, 0xbe, 0xa0, 0x91, 0x6c, 0xc3, 0xf0, 0xfe, 0xd7, 0x5e, 0xed,
-	0x26, 0xe5, 0x7d, 0x51, 0x8e, 0x36, 0x76, 0x25, 0xb5, 0x49, 0x6d, 0x40, 0x12, 0xa2, 0x61, 0x53,
-	0x00, 0x33, 0x04, 0xe5, 0xf5, 0x56, 0x92, 0x29, 0x10, 0x1c, 0x92, 0x28, 0x81, 0x00, 0x02, 0x80,
-	0xeb, 0xd2, 0x47, 0xc9, 0x25, 0xdf, 0x22, 0xe7, 0x54, 0x6a, 0xef, 0x39, 0xe6, 0x96, 0x73, 0x3e,
-	0x42, 0xae, 0xa9, 0x19, 0x3c, 0x08, 0xd2, 0xd2, 0x8a, 0x95, 0x5c, 0x58, 0xd3, 0xdd, 0xbf, 0xee,
-	0xe9, 0xe9, 0x6e, 0x74, 0xcf, 0x10, 0x1e, 0x5b, 0x8b, 0xc0, 0x5b, 0xda, 0xab, 0xa5, 0x17, 0x9e,
-	0x4e, 0x56, 0xb6, 0x33, 0xa5, 0x01, 0xb1, 0x3c, 0x77, 0x66, 0xcf, 0xdb, 0x7e, 0xe0, 0x45, 0x1e,
-	0x82, 0x35, 0x40, 0x7a, 0x90, 0x03, 0x5b, 0xde, 0x72, 0xe9, 0xb9, 0x31, 0x48, 0x7a, 0x3c, 0xf7,
-	0xbc, 0xb9, 0x43, 0x4f, 0x39, 0x35, 0x59, 0xcd, 0x4e, 0x23, 0x7b, 0x49, 0xc3, 0xc8, 0x5c, 0xfa,
-	0x09, 0xe0, 0xc3, 0x6d, 0xc0, 0xbb, 0xc0, 0xf4, 0x7d, 0x1a, 0x84, 0xb1, 0xfc, 0xe4, 0x4f, 0x9f,
-	0x40, 0xa3, 0x13, 0x6f, 0xdf, 0xe5, 0xbb, 0xa3, 0x2f, 0xa0, 0x68, 0x4f, 0xc5, 0xc2, 0x93, 0xc2,
-	0xd3, 0xda, 0xd9, 0x07, 0xed, 0xf5, 0xc6, 0xed, 0x0d, 0x58, 0x5b, 0x9d, 0xe2, 0xa2, 0x3d, 0x45,
-	0x5f, 0xc3, 0xc1, 0x9c, 0xba, 0x34, 0x30, 0x1d, 0xb1, 0xc8, 0x55, 0x3e, 0xba, 0x5d, 0xa5, 0x1f,
-	0x03, 0x71, 0xaa, 0x81, 0x5e, 0x41, 0xdd, 0x0b, 0xac, 0x05, 0x0d, 0xa3, 0xc0, 0x8c, 0xbc, 0x40,
-	0x2c, 0x71, 0x0b, 0x3f, 0xbd, 0xdd, 0x82, 0x9e, 0x43, 0xe3, 0x0d, 0x5d, 0x24, 0x43, 0xd5, 0x0c,
-	0x22, 0x7b, 0x66, 0x5a, 0x51, 0x28, 0x96, 0xb9, 0xa1, 0x8f, 0x6f, 0x37, 0x24, 0xa7, 0x50, 0xbc,
-	0xd6, 0x42, 0xbf, 0x80, 0x7d, 0xae, 0x40, 0xc5, 0x3d, 0xae, 0xff, 0xe4, 0x76, 0xfd, 0x2e, 0xc7,
-	0xe1, 0x04, 0x8f, 0x9e, 0xc3, 0x1e, 0xcf, 0xa1, 0xb8, 0xcf, 0x15, 0x1f, 0xdf, 0xae, 0xc8, 0x29,
-	0x1c, 0xa3, 0x51, 0x07, 0x60, 0xe5, 0xda, 0x11, 0x89, 0x68, 0x18, 0x85, 0xe2, 0xc1, 0x5d, 0x4e,
-	0x8f, 0x5d, 0x3b, 0x32, 0x18, 0x14, 0x57, 0x57, 0xe9, 0x52, 0xfa, 0x6b, 0x01, 0x8a, 0xea, 0x14,
-	0x21, 0x28, 0xbb, 0xe6, 0x92, 0xf2, 0xbc, 0x55, 0x31, 0x5f, 0xa3, 0xfb, 0xb0, 0x3f, 0x09, 0x4c,
-	0xd7, 0x5a, 0xf0, 0xd4, 0x54, 0x71, 0x42, 0xa1, 0xe7, 0x50, 0x8e, 0xae, 0x7d, 0xca, 0xc3, 0xdd,
-	0xfc, 0xb1, 0x84, 0xa9, 0xd3, 0xb6, 0x71, 0xed, 0x53, 0xcc, 0xe1, 0x27, 0x97, 0x50, 0x66, 0x14,
-	0x3a, 0x06, 0xc1, 0x78, 0x3b, 0x54, 0xc8, 0x58, 0x1b, 0x0d, 0x95, 0xae, 0x7a, 0xae, 0x2a, 0x3d,
-	0xe1, 0xff, 0xd0, 0x3e, 0x14, 0xbb, 0xbf, 0x15, 0x0a, 0xa8, 0x09, 0x30, 0xd4, 0x47, 0xc6, 0x68,
-	0xdc, 0xb9, 0x50, 0x0d, 0xa1, 0x88, 0x1a, 0x50, 0x35, 0x74, 0x7d, 0xd0, 0x7d, 0x29, 0xab, 0x9a,
-	0x50, 0x42, 0x87, 0xd0, 0x50, 0xb5, 0x73, 0x1d, 0x5f, 0xc8, 0x86, 0xaa, 0x6b, 0xf2, 0x40, 0x28,
-	0x4b, 0xff, 0x2a, 0xc3, 0x41, 0x52, 0x1a, 0xe8, 0x05, 0x54, 0xac, 0xc0, 0x8e, 0x6c, 0xcb, 0x74,
-	0x92, 0x12, 0x94, 0xda, 0x71, 0x05, 0xb7, 0xd3, 0x0a, 0x6e, 0x77, 0x3c, 0xcf, 0xb9, 0x34, 0x9d,
-	0x15, 0xc5, 0x19, 0x16, 0xe9, 0x50, 0xa3, 0xee, 0xf7, 0x76, 0xe0, 0xb9, 0x4b, 0xea, 0x46, 0xfc,
-	0xbc, 0xcd, 0xb3, 0x2f, 0xef, 0x2c, 0xc5, 0xb6, 0xb2, 0x56, 0xc2, 0x79, 0x0b, 0xa8, 0x07, 0x95,
-	0x60, 0xe5, 0x92, 0x77, 0x0b, 0xea, 0x26, 0x65, 0xf9, 0xe9, 0xdd, 0xd6, 0xf0, 0xca, 0x7d, 0xb3,
-	0xa0, 0x2e, 0x3e, 0x08, 0xe2, 0x05, 0xfa, 0x06, 0x1a, 0x93, 0xc0, 0xbb, 0xa2, 0x2e, 0x99, 0xd0,
-	0x99, 0x17, 0xd0, 0xa4, 0x30, 0xdf, 0x3f, 0x93, 0x91, 0x7e, 0xb6, 0xb8, 0x1e, 0x2b, 0x74, 0x38,
-	0x1e, 0x7d, 0x06, 0x87, 0xe1, 0xf4, 0x8a, 0x58, 0xa6, 0xb5, 0xa0, 0xe4, 0x7b, 0x1a, 0x84, 0xb6,
-	0xe7, 0xf2, 0xea, 0xdc, 0xc3, 0xad, 0x70, 0x7a, 0xd5, 0x65, 0xfc, 0xcb, 0x98, 0x2d, 0xfd, 0xa3,
-	0x00, 0x07, 0x89, 0x07, 0xa8, 0x03, 0xe5, 0xa5, 0x37, 0x8d, 0xcb, 0xa1, 0x79, 0xd6, 0xde, 0xd9,
-	0xf5, 0xf6, 0x85, 0x37, 0xa5, 0x98, 0xeb, 0xa2, 0x8f, 0xa1, 0x31, 0xb3, 0x1d, 0x4a, 0x7c, 0x33,
-	0x8a, 0x68, 0xe0, 0x86, 0x62, 0xf1, 0x49, 0xe9, 0x69, 0x15, 0xd7, 0x19, 0x73, 0x98, 0xf0, 0x4e,
-	0x26, 0x50, 0x66, 0x2a, 0xac, 0x28, 0x2e, 0xf4, 0xde, 0x76, 0x51, 0x34, 0x01, 0xe4, 0xc1, 0x1b,
-	0xf9, 0xed, 0x88, 0xe0, 0xb1, 0x26, 0x14, 0x90, 0x04, 0xf7, 0x75, 0x6d, 0xf0, 0x96, 0x51, 0x44,
-	0xd7, 0xc8, 0xb9, 0x3a, 0x50, 0xc8, 0x85, 0x6c, 0x74, 0x5f, 0x0a, 0x45, 0x24, 0xc2, 0xb1, 0xa6,
-	0xdf, 0x20, 0x29, 0x9d, 0xf4, 0xa1, 0x96, 0xcb, 0x13, 0x7a, 0x04, 0x0f, 0x14, 0xed, 0x52, 0xc5,
-	0xba, 0x76, 0xa1, 0x68, 0xc6, 0xfb, 0x3b, 0x0e, 0xb1, 0xde, 0x1b, 0x77, 0x59, 0x79, 0x09, 0x05,
-	0x54, 0x83, 0x83, 0x91, 0x21, 0xf7, 0x55, 0xad, 0x2f, 0x14, 0xa5, 0x7f, 0x17, 0xa1, 0x9e, 0x6f,
-	0x21, 0x48, 0x82, 0x8a, 0xb5, 0xb0, 0x9d, 0x69, 0x40, 0x5d, 0xb1, 0xc0, 0x4f, 0x97, 0xd1, 0xe8,
-	0x37, 0xd0, 0x9c, 0xdb, 0x91, 0xed, 0xd0, 0x90, 0xb0, 0x96, 0x6b, 0x47, 0x49, 0x83, 0x7b, 0x98,
-	0x0f, 0x66, 0x3f, 0x46, 0x74, 0x39, 0x00, 0x37, 0xe6, 0x79, 0x12, 0x7d, 0x03, 0xcd, 0x39, 0x0d,
-	0x02, 0x3b, 0x22, 0xd6, 0xc2, 0x74, 0xe7, 0x34, 0x14, 0x4b, 0x4f, 0x4a, 0x4f, 0x6b, 0x67, 0xe2,
-	0x86, 0x05, 0x8e, 0xe8, 0x72, 0x00, 0x6e, 0xcc, 0x73, 0x54, 0x88, 0xfe, 0x08, 0xf7, 0x67, 0x9e,
-	0xe3, 0x78, 0xef, 0x88, 0xe7, 0x92, 0x8d, 0x4e, 0x19, 0xd7, 0xd1, 0xd7, 0xbb, 0x75, 0xca, 0xf6,
-	0x39, 0x37, 0xa2, 0xbb, 0x1b, 0xed, 0xf3, 0x78, 0x76, 0x03, 0x57, 0x1a, 0xc3, 0xf1, 0x4d, 0xe8,
-	0x1b, 0xfb, 0xcb, 0xa7, 0x20, 0x98, 0xef, 0x4c, 0x76, 0x3c, 0x6f, 0xe9, 0x3b, 0x34, 0x62, 0xb5,
-	0xc9, 0x62, 0x54, 0xc1, 0x2d, 0xce, 0xef, 0x66, 0x6c, 0xe9, 0x9f, 0x00, 0xd5, 0xac, 0xe7, 0xa2,
-	0xd7, 0x50, 0xf5, 0x03, 0xca, 0x7a, 0x60, 0x14, 0x26, 0x25, 0xfa, 0xe5, 0x0e, 0xbd, 0xba, 0x3d,
-	0x4c, 0x95, 0xf0, 0x5a, 0x1f, 0x7d, 0x0b, 0xcd, 0xb4, 0x85, 0x13, 0xd6, 0xa7, 0xe2, 0x3a, 0x6d,
-	0x9e, 0xfd, 0x6c, 0x17, 0x8b, 0xe9, 0x8a, 0x35, 0xb6, 0x10, 0x37, 0xcc, 0x3c, 0x89, 0xda, 0x70,
-	0x94, 0x6d, 0x43, 0xe6, 0x21, 0x99, 0xac, 0xac, 0x2b, 0x1a, 0xf1, 0x76, 0x50, 0xc5, 0x87, 0x99,
-	0xa8, 0x1f, 0x76, 0xb8, 0x80, 0xe1, 0xb3, 0x61, 0x92, 0xc3, 0x97, 0x63, 0x7c, 0x26, 0xca, 0xf0,
-	0xbf, 0x83, 0x43, 0x7f, 0x35, 0x71, 0xec, 0x70, 0x41, 0xd6, 0xa3, 0x6b, 0x8f, 0x97, 0xc8, 0xe9,
-	0x4e, 0xe1, 0x88, 0x95, 0x55, 0x77, 0xe6, 0x61, 0x21, 0xb1, 0xb4, 0x0e, 0xf2, 0x1f, 0xa0, 0x65,
-	0xbb, 0xfe, 0x2a, 0xca, 0xd9, 0xde, 0xe7, 0xb6, 0x9f, 0xef, 0x62, 0x5b, 0x65, 0xaa, 0x29, 0xc9,
-	0x77, 0x68, 0xda, 0x79, 0x56, 0x28, 0xfd, 0xad, 0x00, 0xb5, 0x9c, 0x07, 0xac, 0x55, 0xa5, 0xa7,
-	0x59, 0x9f, 0x3d, 0x2e, 0x97, 0x56, 0x22, 0xc8, 0x4e, 0x7e, 0x09, 0x8d, 0x14, 0xfb, 0x3f, 0xa6,
-	0xac, 0x9e, 0xd8, 0x59, 0x67, 0x6c, 0xed, 0x83, 0xe3, 0x59, 0x26, 0x2f, 0xca, 0x34, 0x63, 0xa9,
-	0x17, 0x83, 0x44, 0x20, 0xfd, 0xa5, 0x00, 0x87, 0xef, 0x9d, 0x14, 0x99, 0x70, 0xb4, 0x19, 0x39,
-	0xee, 0x64, 0x52, 0xa8, 0xff, 0x85, 0x8f, 0x87, 0x1b, 0x91, 0xe3, 0x33, 0xf4, 0xd7, 0xf0, 0x68,
-	0x6b, 0x8b, 0x9c, 0xbf, 0x69, 0xa7, 0x15, 0x37, 0xf4, 0xd6, 0x6e, 0x87, 0x27, 0x2a, 0x54, 0xb3,
-	0x6f, 0x01, 0x3d, 0x84, 0x7b, 0x43, 0xac, 0x74, 0xc6, 0xea, 0xc0, 0x18, 0x6d, 0x75, 0x43, 0x80,
-	0xfd, 0xe1, 0xb8, 0x33, 0x50, 0xbb, 0x71, 0x27, 0x1c, 0x62, 0xf5, 0x52, 0x36, 0x14, 0xa1, 0x88,
-	0x2a, 0x50, 0xd6, 0x74, 0x4d, 0x11, 0x4a, 0x27, 0x3f, 0x94, 0xa0, 0xb1, 0xe1, 0x2e, 0xfa, 0x10,
-	0x24, 0x19, 0x1b, 0xea, 0xb9, 0xdc, 0x35, 0x08, 0x1b, 0xf4, 0xdb, 0x46, 0x1b, 0x50, 0x55, 0x2f,
-	0xe4, 0xbe, 0x42, 0xbe, 0x53, 0x87, 0x42, 0x01, 0x3d, 0x80, 0x23, 0x43, 0x19, 0x19, 0x64, 0x3c,
-	0xec, 0xc9, 0x86, 0x42, 0x86, 0xf2, 0xdb, 0x81, 0x2e, 0xf7, 0x84, 0x22, 0x42, 0xd0, 0x94, 0xc7,
-	0x86, 0xce, 0x85, 0xac, 0x9f, 0x8f, 0x84, 0x12, 0x6b, 0xcf, 0x86, 0x9c, 0xd1, 0x65, 0xa6, 0x3c,
-	0x54, 0x35, 0x4d, 0xe9, 0x91, 0xfe, 0x98, 0xe1, 0xb8, 0xe1, 0x91, 0xb0, 0x87, 0xea, 0x50, 0x39,
-	0x57, 0xf1, 0xc5, 0x1b, 0x19, 0x2b, 0xc2, 0x3e, 0x6a, 0x41, 0x8d, 0x1f, 0xb0, 0x47, 0x06, 0x7a,
-	0x7f, 0x24, 0x1c, 0xa0, 0x23, 0x68, 0x75, 0x5f, 0x62, 0xfd, 0x42, 0xd1, 0x47, 0xa4, 0xab, 0x6b,
-	0xe7, 0x6a, 0x5f, 0xa8, 0x30, 0xe3, 0xdd, 0xa1, 0x42, 0xb0, 0x32, 0xd4, 0xb1, 0x21, 0x54, 0x99,
-	0x03, 0xb1, 0xa3, 0x32, 0xee, 0xbe, 0x54, 0x2f, 0x95, 0x91, 0x00, 0xe8, 0x03, 0x10, 0xc7, 0xda,
-	0xa5, 0x82, 0xf9, 0x61, 0x88, 0x8e, 0x7b, 0x0a, 0x56, 0xb5, 0x3e, 0xf7, 0x47, 0xa8, 0xb1, 0xf9,
-	0x74, 0x8b, 0xac, 0xce, 0xc2, 0x12, 0x6f, 0x49, 0xba, 0x03, 0x59, 0xeb, 0x93, 0x37, 0x32, 0xd6,
-	0x54, 0xad, 0x3f, 0x8a, 0xe5, 0x8d, 0x2d, 0xcb, 0x83, 0xc1, 0xe5, 0x05, 0x19, 0xf6, 0xf5, 0x58,
-	0xda, 0x44, 0x8f, 0xe1, 0x51, 0x4e, 0x9a, 0x18, 0x92, 0xcf, 0x7b, 0x09, 0xa0, 0x85, 0xfe, 0x1f,
-	0x1e, 0xde, 0x2e, 0x16, 0x36, 0xc4, 0xaf, 0x15, 0xac, 0x29, 0x83, 0x9c, 0xf8, 0x50, 0xfa, 0x04,
-	0xf6, 0xe3, 0x2b, 0x29, 0x1b, 0x69, 0xb6, 0xcb, 0x66, 0x73, 0x72, 0x83, 0xaa, 0xe0, 0x8c, 0x96,
-	0xfe, 0x0c, 0xb0, 0xc7, 0x4b, 0x16, 0x3d, 0x83, 0xea, 0x2a, 0xa4, 0x64, 0xe6, 0x98, 0xf3, 0x90,
-	0x4f, 0xbe, 0xda, 0xd9, 0x51, 0xbe, 0xb0, 0xc7, 0x21, 0x3d, 0x77, 0xcc, 0x39, 0xae, 0xac, 0xe2,
-	0x45, 0x88, 0xde, 0x40, 0xcb, 0xf7, 0x82, 0xc8, 0x9c, 0x53, 0xe2, 0x07, 0x1e, 0xbb, 0x03, 0x24,
-	0xf3, 0xb0, 0x7d, 0xc7, 0x65, 0xb7, 0x3d, 0x8c, 0xd5, 0x86, 0xb1, 0x16, 0x6e, 0xfa, 0x1b, 0x34,
-	0x7a, 0x01, 0x35, 0x7b, 0xc9, 0xcc, 0xc6, 0x9d, 0xa0, 0xc4, 0x3b, 0xc1, 0xbd, 0xbc, 0x51, 0x95,
-	0x89, 0xf9, 0x45, 0x14, 0xec, 0x74, 0x19, 0xa2, 0x01, 0x08, 0xb6, 0x1b, 0x46, 0xa6, 0xe3, 0x10,
-	0xdf, 0xb4, 0xae, 0x4c, 0x36, 0x5f, 0xcb, 0x77, 0xdd, 0x68, 0xf1, 0xca, 0x1d, 0xf9, 0xd4, 0xc2,
-	0xad, 0x44, 0x75, 0x98, 0x68, 0xa2, 0xcf, 0xe1, 0x90, 0x4d, 0x31, 0x76, 0xdf, 0x89, 0x3c, 0xcf,
-	0xb1, 0x16, 0xa6, 0x1d, 0x5f, 0xb4, 0x2a, 0x58, 0x48, 0x04, 0x46, 0xca, 0x47, 0xcf, 0xe0, 0xd8,
-	0xf4, 0x7d, 0xe7, 0x9a, 0x6c, 0x8d, 0xf7, 0x7d, 0x8e, 0x47, 0x5c, 0xd6, 0xdf, 0x98, 0xe4, 0x5f,
-	0x41, 0x25, 0x73, 0xf2, 0x80, 0x87, 0xfb, 0x41, 0xde, 0xc9, 0xc4, 0x0d, 0xde, 0x67, 0x33, 0x20,
-	0xfa, 0x09, 0x34, 0x53, 0x9f, 0x42, 0x6f, 0x15, 0x58, 0x54, 0x04, 0xbe, 0x41, 0x23, 0xe1, 0x8e,
-	0x38, 0x13, 0x7d, 0x01, 0x28, 0x85, 0xad, 0xfc, 0xa9, 0x19, 0x51, 0x12, 0x4e, 0xaf, 0xc4, 0xda,
-	0x86, 0xef, 0x63, 0x2e, 0x18, 0x4d, 0xaf, 0xd0, 0x4b, 0x00, 0x76, 0xa3, 0x8c, 0x91, 0x62, 0xfd,
-	0xae, 0xab, 0x6d, 0x9c, 0xc2, 0xd1, 0xf4, 0x2a, 0xb6, 0x80, 0xab, 0x61, 0xba, 0x44, 0xbf, 0x87,
-	0xc3, 0x34, 0x01, 0xeb, 0x90, 0x35, 0xb8, 0xc1, 0x67, 0x77, 0x19, 0x54, 0x63, 0xc5, 0x2c, 0xa4,
-	0x38, 0xcd, 0xe5, 0x3a, 0xc8, 0x16, 0xdc, 0xdb, 0xce, 0x2f, 0x7f, 0x20, 0x8b, 0x4d, 0xbe, 0xc5,
-	0xe9, 0x8e, 0x5b, 0xa4, 0x19, 0xc6, 0x47, 0x5b, 0x29, 0x67, 0x60, 0xa4, 0x41, 0x9d, 0x3f, 0xc5,
-	0x08, 0x2f, 0xac, 0x50, 0x6c, 0x71, 0xdb, 0x9f, 0xdf, 0x65, 0x9b, 0xff, 0xf2, 0xb2, 0x0c, 0x71,
-	0x6d, 0xb2, 0x26, 0xa4, 0xcf, 0xa0, 0xb9, 0x59, 0xee, 0x48, 0x84, 0x83, 0xf4, 0x7b, 0x89, 0x87,
-	0x61, 0x4a, 0x4a, 0x67, 0x50, 0xcd, 0xe2, 0x7a, 0x43, 0xae, 0x0b, 0x37, 0xe4, 0x5a, 0xfa, 0x25,
-	0x08, 0xdb, 0xa1, 0xdb, 0x55, 0xf5, 0xef, 0x05, 0x68, 0x6d, 0xc5, 0x64, 0x47, 0x55, 0xf4, 0xab,
-	0xf8, 0x31, 0x14, 0xfa, 0xd4, 0x4a, 0x9e, 0x56, 0x3b, 0x7c, 0x62, 0xec, 0x11, 0xc4, 0x16, 0x1b,
-	0xb5, 0x5f, 0xda, 0xb5, 0xf6, 0x3f, 0x82, 0xfa, 0xd4, 0x0e, 0xcd, 0x89, 0x43, 0xc9, 0xdc, 0x5b,
-	0x9a, 0xfc, 0xcb, 0xae, 0xe0, 0x5a, 0xc2, 0xeb, 0x7b, 0x4b, 0x53, 0x52, 0xa0, 0x96, 0xcb, 0xc3,
-	0x76, 0x1f, 0x29, 0xec, 0xd8, 0x47, 0x5e, 0x95, 0x2b, 0x15, 0xa1, 0xfa, 0xaa, 0x5c, 0xa9, 0x0a,
-	0x20, 0xfd, 0x50, 0x80, 0x6a, 0xf6, 0xca, 0x46, 0x3d, 0x38, 0x4c, 0xfc, 0x21, 0x13, 0xc7, 0xb4,
-	0xae, 0x1c, 0x3b, 0x64, 0xb7, 0xb9, 0x1f, 0x3d, 0x81, 0x90, 0x68, 0x74, 0x52, 0x05, 0xf4, 0x1a,
-	0x04, 0x3e, 0xa9, 0xa7, 0x21, 0xc9, 0x82, 0xb8, 0xb7, 0x6b, 0x10, 0x9b, 0x89, 0x6a, 0x42, 0xb3,
-	0x37, 0x19, 0x5d, 0xfa, 0xd1, 0x35, 0x09, 0xaf, 0xc3, 0xc0, 0xf3, 0xa2, 0xa4, 0xe5, 0xd4, 0x39,
-	0x73, 0x14, 0xf3, 0x4e, 0xce, 0xf9, 0x3b, 0x90, 0xe3, 0x45, 0x38, 0x66, 0x2f, 0x2a, 0x36, 0xbe,
-	0xdf, 0xbf, 0x1a, 0xc4, 0xcf, 0x2d, 0xa1, 0x80, 0x0e, 0xa0, 0xc4, 0x16, 0x45, 0x36, 0x75, 0x19,
-	0x5c, 0xf9, 0x56, 0x35, 0x84, 0xd2, 0x89, 0x01, 0xcd, 0x0d, 0xaf, 0x42, 0xd4, 0x81, 0xd6, 0xe6,
-	0x7f, 0x55, 0xe9, 0xf0, 0x78, 0x78, 0xeb, 0x51, 0x70, 0x73, 0xb2, 0x61, 0xa3, 0xf3, 0xe2, 0xbb,
-	0x9f, 0xcf, 0xbd, 0x0c, 0xde, 0xf6, 0x82, 0xf9, 0x69, 0xee, 0xdf, 0x2d, 0xdb, 0x9d, 0x05, 0x66,
-	0xfc, 0x6f, 0xd5, 0xe9, 0xdc, 0xcb, 0x49, 0x26, 0xfb, 0x9c, 0xf9, 0xd5, 0x7f, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0x04, 0x31, 0xcc, 0x6c, 0x39, 0x13, 0x00, 0x00,
+	// 1917 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x5f, 0x93, 0xdb, 0x48,
+	0x11, 0xc7, 0x7f, 0xd6, 0x6b, 0xb7, 0xff, 0x69, 0x67, 0x37, 0x89, 0xa2, 0x1c, 0x97, 0xdc, 0x1e,
+	0x50, 0xb9, 0x83, 0xf3, 0x86, 0x3d, 0x92, 0x82, 0x3a, 0xa8, 0x43, 0xb6, 0xb5, 0x8e, 0x12, 0x5b,
+	0x32, 0x63, 0x79, 0x73, 0x49, 0x01, 0x53, 0xb2, 0x3c, 0xb6, 0x55, 0x2b, 0x4b, 0x42, 0x92, 0x2f,
+	0xb5, 0x5f, 0x83, 0x57, 0x3e, 0x07, 0xc5, 0x13, 0xc5, 0xc3, 0xbd, 0xf3, 0xc8, 0x57, 0xe0, 0x23,
+	0xf0, 0x4a, 0xcd, 0x48, 0xb2, 0x65, 0x27, 0x9b, 0x75, 0xdd, 0xbd, 0xb8, 0xa6, 0xbb, 0x7f, 0xbf,
+	0x9e, 0x9e, 0x99, 0x76, 0xf7, 0x8c, 0xe0, 0xa1, 0xb5, 0x08, 0xbc, 0xa5, 0xbd, 0x5a, 0x7a, 0xe1,
+	0xd9, 0x64, 0x65, 0x3b, 0x53, 0x1a, 0x10, 0xcb, 0x73, 0x67, 0xf6, 0xbc, 0xe5, 0x07, 0x5e, 0xe4,
+	0x21, 0xd8, 0x00, 0xa4, 0x7b, 0x19, 0xb0, 0xe5, 0x2d, 0x97, 0x9e, 0x1b, 0x83, 0xa4, 0x87, 0x73,
+	0xcf, 0x9b, 0x3b, 0xf4, 0x8c, 0x4b, 0x93, 0xd5, 0xec, 0x2c, 0xb2, 0x97, 0x34, 0x8c, 0xcc, 0xa5,
+	0x9f, 0x00, 0x3e, 0xde, 0x05, 0xbc, 0x0d, 0x4c, 0xdf, 0xa7, 0x41, 0x18, 0xdb, 0x4f, 0xff, 0x7a,
+	0x0a, 0xf5, 0x76, 0x3c, 0x7d, 0x87, 0xcf, 0x8e, 0x7e, 0x01, 0x79, 0x7b, 0x2a, 0xe6, 0x1e, 0xe5,
+	0x1e, 0x57, 0xcf, 0x3f, 0x6a, 0x6d, 0x26, 0x6e, 0x6d, 0xc1, 0x5a, 0xea, 0x14, 0xe7, 0xed, 0x29,
+	0xfa, 0x0a, 0x0e, 0xe7, 0xd4, 0xa5, 0x81, 0xe9, 0x88, 0x79, 0x4e, 0xf9, 0xe4, 0x66, 0x4a, 0x2f,
+	0x06, 0xe2, 0x94, 0x81, 0x5e, 0x40, 0xcd, 0x0b, 0xac, 0x05, 0x0d, 0xa3, 0xc0, 0x8c, 0xbc, 0x40,
+	0x2c, 0x70, 0x0f, 0x3f, 0xbb, 0xd9, 0x83, 0x9e, 0x41, 0xe3, 0x2d, 0x2e, 0x92, 0xa1, 0x62, 0x06,
+	0x91, 0x3d, 0x33, 0xad, 0x28, 0x14, 0x8b, 0xdc, 0xd1, 0xa7, 0x37, 0x3b, 0x92, 0x53, 0x28, 0xde,
+	0xb0, 0xd0, 0xaf, 0xa1, 0xc4, 0x09, 0x54, 0x3c, 0xe0, 0xfc, 0x47, 0x37, 0xf3, 0x3b, 0x1c, 0x87,
+	0x13, 0x3c, 0x7a, 0x0a, 0x07, 0xfc, 0x0c, 0xc5, 0x12, 0x27, 0x3e, 0xbc, 0x99, 0xc8, 0x25, 0x1c,
+	0xa3, 0x51, 0x1b, 0x60, 0xe5, 0xda, 0x11, 0x89, 0x68, 0x18, 0x85, 0xe2, 0xe1, 0x6d, 0x41, 0x8f,
+	0x5d, 0x3b, 0x32, 0x18, 0x14, 0x57, 0x56, 0xe9, 0x50, 0xfa, 0x57, 0x0e, 0xf2, 0xea, 0x14, 0x21,
+	0x28, 0xba, 0xe6, 0x92, 0xf2, 0x73, 0xab, 0x60, 0x3e, 0x46, 0x77, 0xa1, 0x34, 0x09, 0x4c, 0xd7,
+	0x5a, 0xf0, 0xa3, 0xa9, 0xe0, 0x44, 0x42, 0x4f, 0xa1, 0x18, 0x5d, 0xfb, 0x94, 0x6f, 0x77, 0xe3,
+	0x43, 0x07, 0xa6, 0x4e, 0x5b, 0xc6, 0xb5, 0x4f, 0x31, 0x87, 0x9f, 0x5e, 0x42, 0x91, 0x49, 0xe8,
+	0x04, 0x04, 0xe3, 0xf5, 0x50, 0x21, 0x63, 0x6d, 0x34, 0x54, 0x3a, 0xea, 0x85, 0xaa, 0x74, 0x85,
+	0x1f, 0xa1, 0x12, 0xe4, 0x3b, 0x7f, 0x10, 0x72, 0xa8, 0x01, 0x30, 0xd4, 0x47, 0xc6, 0x68, 0xdc,
+	0x1e, 0xa8, 0x86, 0x90, 0x47, 0x75, 0xa8, 0x18, 0xba, 0xde, 0xef, 0x3c, 0x97, 0x55, 0x4d, 0x28,
+	0xa0, 0x23, 0xa8, 0xab, 0xda, 0x85, 0x8e, 0x07, 0xb2, 0xa1, 0xea, 0x9a, 0xdc, 0x17, 0x8a, 0xd2,
+	0x7f, 0x8b, 0x70, 0x98, 0xa4, 0x06, 0x7a, 0x06, 0x65, 0x2b, 0xb0, 0x23, 0xdb, 0x32, 0x9d, 0x24,
+	0x05, 0xa5, 0x56, 0x9c, 0xc1, 0xad, 0x34, 0x83, 0x5b, 0x6d, 0xcf, 0x73, 0x2e, 0x4d, 0x67, 0x45,
+	0xf1, 0x1a, 0x8b, 0x74, 0xa8, 0x52, 0xf7, 0x5b, 0x3b, 0xf0, 0xdc, 0x25, 0x75, 0x23, 0xbe, 0xde,
+	0xc6, 0xf9, 0x17, 0xb7, 0xa6, 0x62, 0x4b, 0xd9, 0x90, 0x70, 0xd6, 0x03, 0xea, 0x42, 0x39, 0x58,
+	0xb9, 0xe4, 0xed, 0x82, 0xba, 0x49, 0x5a, 0x7e, 0x76, 0xbb, 0x37, 0xbc, 0x72, 0x5f, 0x2d, 0xa8,
+	0x8b, 0x0f, 0x83, 0x78, 0x80, 0xbe, 0x86, 0xfa, 0x24, 0xf0, 0xae, 0xa8, 0x4b, 0x26, 0x74, 0xe6,
+	0x05, 0x34, 0x49, 0xcc, 0x77, 0xd7, 0x64, 0xa4, 0x7f, 0x5b, 0x5c, 0x8b, 0x09, 0x6d, 0x8e, 0x47,
+	0x9f, 0xc3, 0x51, 0x38, 0xbd, 0x22, 0x96, 0x69, 0x2d, 0x28, 0xf9, 0x96, 0x06, 0xa1, 0xed, 0xb9,
+	0x3c, 0x3b, 0x0f, 0x70, 0x33, 0x9c, 0x5e, 0x75, 0x98, 0xfe, 0x32, 0x56, 0x4b, 0xff, 0xc9, 0xc1,
+	0x61, 0x12, 0x01, 0x6a, 0x43, 0x71, 0xe9, 0x4d, 0xe3, 0x74, 0x68, 0x9c, 0xb7, 0xf6, 0x0e, 0xbd,
+	0x35, 0xf0, 0xa6, 0x14, 0x73, 0x2e, 0xfa, 0x14, 0xea, 0x33, 0xdb, 0xa1, 0xc4, 0x37, 0xa3, 0x88,
+	0x06, 0x6e, 0x28, 0xe6, 0x1f, 0x15, 0x1e, 0x57, 0x70, 0x8d, 0x29, 0x87, 0x89, 0xee, 0x74, 0x02,
+	0x45, 0x46, 0x61, 0x49, 0x31, 0xd0, 0xbb, 0xbb, 0x49, 0xd1, 0x00, 0x90, 0xfb, 0xaf, 0xe4, 0xd7,
+	0x23, 0x82, 0xc7, 0x9a, 0x90, 0x43, 0x12, 0xdc, 0xd5, 0xb5, 0xfe, 0x6b, 0x26, 0x11, 0x5d, 0x23,
+	0x17, 0x6a, 0x5f, 0x21, 0x03, 0xd9, 0xe8, 0x3c, 0x17, 0xf2, 0x48, 0x84, 0x13, 0x4d, 0x7f, 0x8f,
+	0xa5, 0x70, 0xda, 0x83, 0x6a, 0xe6, 0x9c, 0xd0, 0x03, 0xb8, 0xa7, 0x68, 0x97, 0x2a, 0xd6, 0xb5,
+	0x81, 0xa2, 0x19, 0xef, 0xce, 0x38, 0xc4, 0x7a, 0x77, 0xdc, 0x61, 0xe9, 0x25, 0xe4, 0x50, 0x15,
+	0x0e, 0x47, 0x86, 0xdc, 0x53, 0xb5, 0x9e, 0x90, 0x97, 0xfe, 0x97, 0x87, 0x5a, 0xb6, 0x84, 0x20,
+	0x09, 0xca, 0xd6, 0xc2, 0x76, 0xa6, 0x01, 0x75, 0xc5, 0x1c, 0x5f, 0xdd, 0x5a, 0x46, 0xbf, 0x87,
+	0xc6, 0xdc, 0x8e, 0x6c, 0x87, 0x86, 0x84, 0x95, 0x5c, 0x3b, 0x4a, 0x0a, 0xdc, 0xfd, 0xec, 0x66,
+	0xf6, 0x62, 0x44, 0x87, 0x03, 0x70, 0x7d, 0x9e, 0x15, 0xd1, 0xd7, 0xd0, 0x98, 0xd3, 0x20, 0xb0,
+	0x23, 0x62, 0x2d, 0x4c, 0x77, 0x4e, 0x43, 0xb1, 0xf0, 0xa8, 0xf0, 0xb8, 0x7a, 0x2e, 0x6e, 0x79,
+	0xe0, 0x88, 0x0e, 0x07, 0xe0, 0xfa, 0x3c, 0x23, 0x85, 0xe8, 0x2f, 0x70, 0x77, 0xe6, 0x39, 0x8e,
+	0xf7, 0x96, 0x78, 0x2e, 0xd9, 0xaa, 0x94, 0x71, 0x1e, 0x7d, 0xb5, 0x5f, 0xa5, 0x6c, 0x5d, 0x70,
+	0x27, 0xba, 0xbb, 0x55, 0x3e, 0x4f, 0x66, 0xef, 0xd1, 0x4a, 0x63, 0x38, 0x79, 0x1f, 0xfa, 0xbd,
+	0xf5, 0xe5, 0x33, 0x10, 0xcc, 0xb7, 0x26, 0x5b, 0x9e, 0xb7, 0xf4, 0x1d, 0x1a, 0xb1, 0xdc, 0x64,
+	0x7b, 0x54, 0xc6, 0x4d, 0xae, 0xef, 0xac, 0xd5, 0xd2, 0x3f, 0x00, 0x2a, 0xeb, 0x9a, 0x8b, 0x5e,
+	0x42, 0xc5, 0x0f, 0x28, 0xab, 0x81, 0x51, 0x98, 0xa4, 0xe8, 0x17, 0x7b, 0xd4, 0xea, 0xd6, 0x30,
+	0x25, 0xe1, 0x0d, 0x1f, 0x7d, 0x03, 0x8d, 0xb4, 0x84, 0x13, 0x56, 0xa7, 0xe2, 0x3c, 0x6d, 0x9c,
+	0xff, 0x72, 0x1f, 0x8f, 0xe9, 0x88, 0x15, 0xb6, 0x10, 0xd7, 0xcd, 0xac, 0x88, 0x5a, 0x70, 0xbc,
+	0x9e, 0x86, 0xcc, 0x43, 0x32, 0x59, 0x59, 0x57, 0x34, 0xe2, 0xe5, 0xa0, 0x82, 0x8f, 0xd6, 0xa6,
+	0x5e, 0xd8, 0xe6, 0x06, 0x86, 0x5f, 0x37, 0x93, 0x0c, 0xbe, 0x18, 0xe3, 0xd7, 0xa6, 0x35, 0xfe,
+	0x8f, 0x70, 0xe4, 0xaf, 0x26, 0x8e, 0x1d, 0x2e, 0xc8, 0xa6, 0x75, 0x1d, 0xf0, 0x14, 0x39, 0xdb,
+	0x6b, 0x3b, 0x62, 0xb2, 0xea, 0xce, 0x3c, 0x2c, 0x24, 0x9e, 0x36, 0x9b, 0xfc, 0x67, 0x68, 0xda,
+	0xae, 0xbf, 0x8a, 0x32, 0xbe, 0x4b, 0xdc, 0xf7, 0xd3, 0x7d, 0x7c, 0xab, 0x8c, 0x9a, 0x8a, 0x7c,
+	0x86, 0x86, 0x9d, 0x55, 0x85, 0xd2, 0xdf, 0x72, 0x50, 0xcd, 0x44, 0x80, 0x2e, 0xa1, 0x9e, 0xae,
+	0xe6, 0x07, 0x1e, 0x43, 0x2d, 0xf1, 0xb3, 0x39, 0x85, 0xc4, 0xef, 0x3c, 0x24, 0x8e, 0x67, 0x99,
+	0x3c, 0xd1, 0xd2, 0x53, 0x88, 0x4d, 0xbd, 0xb0, 0x9f, 0x18, 0x5e, 0x14, 0xcb, 0x39, 0x21, 0x2f,
+	0xfd, 0x3d, 0x07, 0x47, 0xef, 0xac, 0x01, 0x99, 0x70, 0xbc, 0xbd, 0x27, 0x3c, 0xd4, 0x24, 0x05,
+	0xbf, 0x47, 0xa4, 0x47, 0x5b, 0x7b, 0xc2, 0xbb, 0xe3, 0xef, 0xe0, 0xc1, 0xce, 0x14, 0x99, 0xa8,
+	0xd3, 0x1a, 0x2a, 0x6e, 0xf1, 0x36, 0xc1, 0x87, 0xa7, 0x2a, 0x54, 0xd6, 0x59, 0x8e, 0xee, 0xc3,
+	0x9d, 0x21, 0x56, 0xda, 0x63, 0xb5, 0x6f, 0x8c, 0x76, 0xea, 0x1c, 0x40, 0x69, 0x38, 0x6e, 0xf7,
+	0xd5, 0x4e, 0x5c, 0xe3, 0x86, 0x58, 0xbd, 0x94, 0x0d, 0x45, 0xc8, 0xa3, 0x32, 0x14, 0x35, 0x5d,
+	0x53, 0x84, 0xc2, 0xe9, 0x77, 0x05, 0xa8, 0x6f, 0x85, 0x8b, 0x3e, 0x06, 0x49, 0xc6, 0x86, 0x7a,
+	0x21, 0x77, 0x0c, 0xc2, 0x5a, 0xf8, 0xae, 0xd3, 0x3a, 0x54, 0xd4, 0x81, 0xdc, 0x53, 0xc8, 0x1b,
+	0x75, 0x28, 0xe4, 0xd0, 0x3d, 0x38, 0x36, 0x94, 0x91, 0x41, 0xc6, 0xc3, 0xae, 0x6c, 0x28, 0x64,
+	0x28, 0xbf, 0xee, 0xeb, 0x72, 0x57, 0xc8, 0x23, 0x04, 0x0d, 0x79, 0x6c, 0xe8, 0xdc, 0xc8, 0x2a,
+	0xf5, 0x48, 0x28, 0xb0, 0xc2, 0x6b, 0xc8, 0x6b, 0xb9, 0xc8, 0xc8, 0x43, 0x55, 0xd3, 0x94, 0x2e,
+	0xe9, 0x8d, 0x19, 0x8e, 0x3b, 0x1e, 0x09, 0x07, 0xa8, 0x06, 0xe5, 0x0b, 0x15, 0x0f, 0x5e, 0xc9,
+	0x58, 0x11, 0x4a, 0xa8, 0x09, 0x55, 0xbe, 0xc0, 0x2e, 0xe9, 0xeb, 0xbd, 0x91, 0x70, 0x88, 0x8e,
+	0xa1, 0xd9, 0x79, 0x8e, 0xf5, 0x81, 0xa2, 0x8f, 0x48, 0x47, 0xd7, 0x2e, 0xd4, 0x9e, 0x50, 0x66,
+	0xce, 0x3b, 0x43, 0x85, 0x60, 0x65, 0xa8, 0x63, 0x43, 0xa8, 0xb0, 0x00, 0xe2, 0x40, 0x65, 0xdc,
+	0x79, 0xae, 0x5e, 0x2a, 0x23, 0x01, 0xd0, 0x47, 0x20, 0x8e, 0xb5, 0x4b, 0x05, 0xf3, 0xc5, 0x10,
+	0x1d, 0x77, 0x15, 0xac, 0x6a, 0x3d, 0x1e, 0x8f, 0x50, 0x65, 0x9d, 0xe7, 0x06, 0x5b, 0x8d, 0x6d,
+	0x4b, 0x3c, 0x25, 0xe9, 0xf4, 0x65, 0xad, 0x47, 0x5e, 0xc9, 0x58, 0x53, 0xb5, 0xde, 0x28, 0xb6,
+	0xd7, 0x77, 0x3c, 0xf7, 0xfb, 0x97, 0x03, 0x32, 0xec, 0xe9, 0xb1, 0xb5, 0x81, 0x1e, 0xc2, 0x83,
+	0x8c, 0x35, 0x71, 0x24, 0x5f, 0x74, 0x13, 0x40, 0x13, 0xfd, 0x18, 0xee, 0xdf, 0x6c, 0x16, 0xb6,
+	0xcc, 0x2f, 0x15, 0xac, 0x29, 0xfd, 0x8c, 0xf9, 0x48, 0xfa, 0x09, 0x94, 0xe2, 0xcb, 0x26, 0x6b,
+	0x56, 0xb6, 0xcb, 0xba, 0x6e, 0x72, 0x37, 0x2a, 0xe3, 0xb5, 0x2c, 0xfd, 0xb3, 0x0c, 0x07, 0x3c,
+	0x65, 0xd1, 0x13, 0xa8, 0xac, 0x42, 0x4a, 0x66, 0x8e, 0x39, 0x0f, 0x79, 0x4f, 0xab, 0x9e, 0x1f,
+	0x67, 0x13, 0x7b, 0x1c, 0xd2, 0x0b, 0xc7, 0x9c, 0xe3, 0xf2, 0x2a, 0x1e, 0x84, 0xe8, 0x15, 0x34,
+	0x7d, 0x2f, 0x88, 0xcc, 0x39, 0x25, 0x7e, 0xe0, 0xb1, 0xee, 0x9e, 0x74, 0xba, 0xd6, 0x2d, 0xd7,
+	0xd8, 0xd6, 0x30, 0xa6, 0x0d, 0x63, 0x16, 0x6e, 0xf8, 0x5b, 0x32, 0x7a, 0x02, 0x27, 0xa6, 0xef,
+	0x3b, 0xd7, 0x64, 0xa7, 0x0b, 0x96, 0x78, 0xf0, 0x88, 0xdb, 0x7a, 0x5b, 0x0d, 0xef, 0x39, 0x00,
+	0xbb, 0xee, 0xac, 0xfc, 0xa9, 0x19, 0x51, 0xb1, 0x76, 0xdb, 0xbd, 0x2b, 0x8e, 0x62, 0x34, 0xbd,
+	0x1a, 0x73, 0x02, 0xae, 0x84, 0xe9, 0x10, 0xfd, 0x09, 0x8e, 0x6c, 0x37, 0x8c, 0x4c, 0xc7, 0x21,
+	0x91, 0xe7, 0x39, 0xd6, 0xc2, 0xb4, 0x5d, 0xb1, 0xce, 0x1d, 0x3e, 0xb9, 0xcd, 0xa1, 0x1a, 0x13,
+	0x8d, 0x94, 0x87, 0x05, 0x7b, 0x47, 0x83, 0x2c, 0xb8, 0x93, 0xba, 0xf7, 0x4d, 0xeb, 0xca, 0x9c,
+	0xf3, 0x5b, 0x82, 0x3b, 0x13, 0x1b, 0x7c, 0x8a, 0xb3, 0x3d, 0xa7, 0x18, 0x26, 0x5c, 0x7c, 0x6c,
+	0x6f, 0x2b, 0x18, 0x18, 0xbd, 0x01, 0x61, 0x77, 0x12, 0x51, 0xf8, 0x7e, 0xfe, 0x9b, 0x3b, 0xfe,
+	0x91, 0x06, 0x35, 0xfe, 0x06, 0x21, 0xf6, 0x92, 0xfb, 0x6d, 0x72, 0xbf, 0x3f, 0xbf, 0xcd, 0x2f,
+	0xff, 0x55, 0x39, 0x05, 0x57, 0x27, 0x1b, 0x41, 0xfa, 0x1c, 0x1a, 0xdb, 0xd9, 0x80, 0x44, 0x38,
+	0x4c, 0xd3, 0x29, 0xbe, 0x34, 0xa4, 0xa2, 0x74, 0x0e, 0x95, 0xf5, 0x99, 0xa1, 0x9f, 0x42, 0x83,
+	0x5d, 0x1f, 0xd8, 0x45, 0x33, 0xf4, 0x56, 0x81, 0x45, 0x93, 0xdc, 0xae, 0x27, 0xda, 0x11, 0x57,
+	0x4a, 0xbf, 0x01, 0x61, 0xf7, 0x58, 0xf6, 0xa5, 0xfe, 0x3b, 0x07, 0xcd, 0x9d, 0xfd, 0xd8, 0x93,
+	0x8a, 0x7e, 0x1b, 0xbf, 0x02, 0x42, 0x9f, 0x5a, 0xc9, 0x9b, 0xe2, 0x03, 0xaf, 0x25, 0xbc, 0x72,
+	0x47, 0x3e, 0xb5, 0xf8, 0xed, 0x9f, 0x0d, 0xd0, 0x97, 0x50, 0x5e, 0x9f, 0x5b, 0x7c, 0xf3, 0xbb,
+	0x97, 0x65, 0x27, 0xc1, 0xf0, 0xe6, 0xba, 0x06, 0xa2, 0x4f, 0xa0, 0x36, 0xb5, 0x43, 0x73, 0xe2,
+	0x50, 0x32, 0xf7, 0x96, 0x26, 0xbf, 0x3d, 0x94, 0x71, 0x35, 0xd1, 0xf5, 0xbc, 0xa5, 0x29, 0x29,
+	0x50, 0xcd, 0x9c, 0x03, 0x7a, 0x06, 0x55, 0x7e, 0x88, 0x49, 0xdb, 0xcd, 0xf1, 0xb6, 0x7b, 0x27,
+	0x3b, 0x13, 0x07, 0xf2, 0x97, 0x1c, 0xd8, 0xe9, 0x30, 0x7c, 0x51, 0x2c, 0x17, 0x84, 0xd2, 0x8b,
+	0x62, 0xf9, 0x50, 0xa8, 0x49, 0xdf, 0xe5, 0xa0, 0xb2, 0x7e, 0x5e, 0xa2, 0x2e, 0x1c, 0x25, 0xf1,
+	0x90, 0x89, 0x63, 0x5a, 0x57, 0x8e, 0x1d, 0xb2, 0x6b, 0xcc, 0x07, 0x57, 0x20, 0x24, 0x8c, 0x76,
+	0x4a, 0x40, 0x2f, 0x41, 0xe0, 0x8d, 0x6c, 0x1a, 0x92, 0xf5, 0x26, 0x1e, 0xec, 0xbb, 0x89, 0x8d,
+	0x84, 0x9a, 0xc8, 0xec, 0x31, 0x42, 0x97, 0x7e, 0x74, 0x4d, 0xc2, 0xeb, 0x30, 0xf0, 0xbc, 0x28,
+	0x29, 0x22, 0x35, 0xae, 0x1c, 0xc5, 0xba, 0xd3, 0x0b, 0xfe, 0x00, 0xe2, 0x78, 0x11, 0x4e, 0xd8,
+	0x53, 0x82, 0x75, 0xb7, 0x77, 0x3b, 0x67, 0xfc, 0xce, 0x10, 0x72, 0xe8, 0x10, 0x0a, 0x6c, 0x90,
+	0x67, 0x4d, 0x89, 0xc1, 0x95, 0x6f, 0x54, 0x43, 0x28, 0x9c, 0x1a, 0xd0, 0xd8, 0x8a, 0x2a, 0x44,
+	0x6d, 0x68, 0x6e, 0x7f, 0xa4, 0x49, 0x6b, 0xeb, 0xfd, 0x1b, 0x97, 0x82, 0x1b, 0x93, 0x2d, 0x1f,
+	0xed, 0x67, 0x6f, 0x7e, 0x35, 0xf7, 0xd6, 0xf0, 0x96, 0x17, 0xcc, 0xcf, 0x32, 0x9f, 0x75, 0x6c,
+	0x77, 0x16, 0x98, 0xf1, 0x67, 0x9a, 0xb3, 0xb9, 0x97, 0xb1, 0x4c, 0x4a, 0x5c, 0xf9, 0xe5, 0xff,
+	0x03, 0x00, 0x00, 0xff, 0xff, 0x28, 0xe2, 0x19, 0x35, 0x32, 0x12, 0x00, 0x00,
 }
diff --git a/src/chromiumos/builder_config.proto b/src/chromiumos/builder_config.proto
index a4db892..73f01a1 100644
--- a/src/chromiumos/builder_config.proto
+++ b/src/chromiumos/builder_config.proto
@@ -203,10 +203,7 @@
     string artifacts_gs_bucket = 4;
 
     message PublishInfo {
-      // Google storage bucket to publish these artifact types to.
-      // TODO(crbug/1019868): remove this after uses have migrated.
-      // DEPRECTATED: use publish_gs_location.
-      string publish_gs_bucket = 1;
+      reserved 1;
 
       // Artifact types to publish to this bucket.
       repeated ArtifactTypes publish_types = 2;
@@ -256,44 +253,17 @@
     }
     PortageProfile portage_profile = 2;
 
-    // Image types to build.
-    // DEPRECATED: Use steps.build_images.image_types.
-    repeated ImageType image_types = 3;
-
-    // Controls the running of the install packages step.
-    // DEPRECATED: Use steps.install_packages_conf.run_spec.
-    RunSpec install_packages = 4;
-
-    // Compile toolchain from source (true), or use bin packages (false).  This
-    // applies to the install toolchain step only.
-    // DEPRECATED: Use steps.install_toolchain.compile_source.
-    bool compile_toolchain = 5;
+    reserved 3 to 5;
 
     // Whether to apply gerrit changes, if any. Use case is to build without
     // changes after failure to identify the changes as the culprit.
     bool apply_gerrit_changes = 6;
 
-    // Packages to build, or empty to build all packages.
-    // DEPRECATED: Use steps.install_packages_conf.packages.
-    repeated PackageInfo packages = 7;
-
-    reserved 8, 9;
-
-    // Build packages from source (true), or use bin packages (false).  This
-    // applies to the install packages step only.
-    // DEPRECATED: Use steps.install_packages_conf.compile_source.
-    bool compile_source = 10;
-
-    // Compile sdk packages from source (true) or use prebuilts (false).  This
-    // applies to the update sdk step only.
-    // DEPRECATED: Use steps.sdk_update.compile_source.
-    bool compile_update_sdk = 11;
+    reserved 7 to 11;
 
     // Below here are configuration specifications for the steps that call the
     // Build API endpoints.
-    //
-    // TODO(crbug/1038975): remove DEPRECATED fields above.
-    //
+
     // Controls for the call to SdkService.Update.
     message SdkUpdate {
       // Whether to compile from source (vs using prebuilts when able.)
@@ -323,9 +293,9 @@
       // goma disabled.
       bool disable_goma = 4;
     }
-    // TODO(crbug/1038975): rename this to install_packages once the RunSpec is
-    // gone above.
+    // TODO(crbug:1038975): drop install_packages_conf
     InstallPackages install_packages_conf = 14;
+    InstallPackages install_packages = 16;
 
     message BuildImages {
       // Image types to build.