cq: move cqdepend_options into ConfigGroup.

This is more convenient for CQ implementation, and also provides for
experimentation in infra[_internal] repos.

Change is backwards incompatible, but nobody should be using
an EXPERIMENTAL field and expect stability.

R=vadimsh

Bug: 912294
Change-Id: I561a3f7659d6466b9a8a685e194e07dfd5bc59ae
Reviewed-on: https://chromium-review.googlesource.com/c/infra/luci/luci-go/+/1566637
Commit-Queue: smut <smut@google.com>
Reviewed-by: smut <smut@google.com>
Auto-Submit: Andrii Shyshkalov <tandrii@chromium.org>
diff --git a/cq/api/config/v2/cq.pb.go b/cq/api/config/v2/cq.pb.go
index 273631c..a5ebe3c 100644
--- a/cq/api/config/v2/cq.pb.go
+++ b/cq/api/config/v2/cq.pb.go
@@ -67,12 +67,10 @@
 	// Optional options for how CLs should be submitted.
 	SubmitOptions *SubmitOptions `protobuf:"bytes,3,opt,name=submit_options,json=submitOptions,proto3" json:"submit_options,omitempty"`
 	// At least 1 ConfigGroup is required.
-	ConfigGroups []*ConfigGroup `protobuf:"bytes,4,rep,name=config_groups,json=configGroups,proto3" json:"config_groups,omitempty"`
-	// EXPERIMENTAL!
-	CqdependOptions      *CQDependOptions `protobuf:"bytes,5,opt,name=cqdepend_options,json=cqdependOptions,proto3" json:"cqdepend_options,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
-	XXX_unrecognized     []byte           `json:"-"`
-	XXX_sizecache        int32            `json:"-"`
+	ConfigGroups         []*ConfigGroup `protobuf:"bytes,4,rep,name=config_groups,json=configGroups,proto3" json:"config_groups,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
 func (m *Config) Reset()         { *m = Config{} }
@@ -128,13 +126,6 @@
 	return nil
 }
 
-func (m *Config) GetCqdependOptions() *CQDependOptions {
-	if m != nil {
-		return m.CqdependOptions
-	}
-	return nil
-}
-
 // SubmitOptions control how CQ submits CLs.
 type SubmitOptions struct {
 	// Optional. Maximum number of successful CQ attempts completed by submitting
@@ -194,51 +185,13 @@
 	return nil
 }
 
-// EXPERIMENTAL! TODO(tandrii, crbug/912294): add doc.
-type CQDependOptions struct {
-	Allowed              Trinary  `protobuf:"varint,1,opt,name=allowed,proto3,enum=cq.config.Trinary" json:"allowed,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *CQDependOptions) Reset()         { *m = CQDependOptions{} }
-func (m *CQDependOptions) String() string { return proto.CompactTextString(m) }
-func (*CQDependOptions) ProtoMessage()    {}
-func (*CQDependOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_59a2f489dbd601ec, []int{2}
-}
-
-func (m *CQDependOptions) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_CQDependOptions.Unmarshal(m, b)
-}
-func (m *CQDependOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_CQDependOptions.Marshal(b, m, deterministic)
-}
-func (m *CQDependOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CQDependOptions.Merge(m, src)
-}
-func (m *CQDependOptions) XXX_Size() int {
-	return xxx_messageInfo_CQDependOptions.Size(m)
-}
-func (m *CQDependOptions) XXX_DiscardUnknown() {
-	xxx_messageInfo_CQDependOptions.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_CQDependOptions proto.InternalMessageInfo
-
-func (m *CQDependOptions) GetAllowed() Trinary {
-	if m != nil {
-		return m.Allowed
-	}
-	return Trinary_UNSET
-}
-
 // ConfigGroup allows one to share single verifiers config across a set of
 // Gerrit repositories, which may be in different Gerrit installations.
 type ConfigGroup struct {
 	// At least 1 Gerrit instance with repositories to work with is required.
 	Gerrit []*ConfigGroup_Gerrit `protobuf:"bytes,1,rep,name=gerrit,proto3" json:"gerrit,omitempty"`
+	// EXPERIMENTAL!
+	CqdependOptions *CQDependOptions `protobuf:"bytes,3,opt,name=cqdepend_options,json=cqdependOptions,proto3" json:"cqdepend_options,omitempty"`
 	// Defines how to verify a CL before submitting it. Required.
 	Verifiers            *Verifiers `protobuf:"bytes,2,opt,name=verifiers,proto3" json:"verifiers,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
@@ -250,7 +203,7 @@
 func (m *ConfigGroup) String() string { return proto.CompactTextString(m) }
 func (*ConfigGroup) ProtoMessage()    {}
 func (*ConfigGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_59a2f489dbd601ec, []int{3}
+	return fileDescriptor_59a2f489dbd601ec, []int{2}
 }
 
 func (m *ConfigGroup) XXX_Unmarshal(b []byte) error {
@@ -278,6 +231,13 @@
 	return nil
 }
 
+func (m *ConfigGroup) GetCqdependOptions() *CQDependOptions {
+	if m != nil {
+		return m.CqdependOptions
+	}
+	return nil
+}
+
 func (m *ConfigGroup) GetVerifiers() *Verifiers {
 	if m != nil {
 		return m.Verifiers
@@ -303,7 +263,7 @@
 func (m *ConfigGroup_Gerrit) String() string { return proto.CompactTextString(m) }
 func (*ConfigGroup_Gerrit) ProtoMessage()    {}
 func (*ConfigGroup_Gerrit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_59a2f489dbd601ec, []int{3, 0}
+	return fileDescriptor_59a2f489dbd601ec, []int{2, 0}
 }
 
 func (m *ConfigGroup_Gerrit) XXX_Unmarshal(b []byte) error {
@@ -375,7 +335,7 @@
 func (m *ConfigGroup_Gerrit_Project) String() string { return proto.CompactTextString(m) }
 func (*ConfigGroup_Gerrit_Project) ProtoMessage()    {}
 func (*ConfigGroup_Gerrit_Project) Descriptor() ([]byte, []int) {
-	return fileDescriptor_59a2f489dbd601ec, []int{3, 0, 0}
+	return fileDescriptor_59a2f489dbd601ec, []int{2, 0, 0}
 }
 
 func (m *ConfigGroup_Gerrit_Project) XXX_Unmarshal(b []byte) error {
@@ -410,6 +370,46 @@
 	return nil
 }
 
+// EXPERIMENTAL! TODO(tandrii, crbug/912294): add doc.
+type CQDependOptions struct {
+	Allowed              Trinary  `protobuf:"varint,1,opt,name=allowed,proto3,enum=cq.config.Trinary" json:"allowed,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CQDependOptions) Reset()         { *m = CQDependOptions{} }
+func (m *CQDependOptions) String() string { return proto.CompactTextString(m) }
+func (*CQDependOptions) ProtoMessage()    {}
+func (*CQDependOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_59a2f489dbd601ec, []int{3}
+}
+
+func (m *CQDependOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CQDependOptions.Unmarshal(m, b)
+}
+func (m *CQDependOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CQDependOptions.Marshal(b, m, deterministic)
+}
+func (m *CQDependOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CQDependOptions.Merge(m, src)
+}
+func (m *CQDependOptions) XXX_Size() int {
+	return xxx_messageInfo_CQDependOptions.Size(m)
+}
+func (m *CQDependOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_CQDependOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CQDependOptions proto.InternalMessageInfo
+
+func (m *CQDependOptions) GetAllowed() Trinary {
+	if m != nil {
+		return m.Allowed
+	}
+	return Trinary_UNSET
+}
+
 // Verifiers are various types of checks that a Commit Queue performs on a CL.
 // All verifiers must pass in order for a CL to be submitted. Configuration file
 // describes types of verifiers that should be applied to each CL and their
@@ -1128,10 +1128,10 @@
 	proto.RegisterEnum("cq.config.Trinary", Trinary_name, Trinary_value)
 	proto.RegisterType((*Config)(nil), "cq.config.Config")
 	proto.RegisterType((*SubmitOptions)(nil), "cq.config.SubmitOptions")
-	proto.RegisterType((*CQDependOptions)(nil), "cq.config.CQDependOptions")
 	proto.RegisterType((*ConfigGroup)(nil), "cq.config.ConfigGroup")
 	proto.RegisterType((*ConfigGroup_Gerrit)(nil), "cq.config.ConfigGroup.Gerrit")
 	proto.RegisterType((*ConfigGroup_Gerrit_Project)(nil), "cq.config.ConfigGroup.Gerrit.Project")
+	proto.RegisterType((*CQDependOptions)(nil), "cq.config.CQDependOptions")
 	proto.RegisterType((*Verifiers)(nil), "cq.config.Verifiers")
 	proto.RegisterType((*Verifiers_GerritCQAbility)(nil), "cq.config.Verifiers.GerritCQAbility")
 	proto.RegisterType((*Verifiers_TreeStatus)(nil), "cq.config.Verifiers.TreeStatus")
@@ -1148,77 +1148,77 @@
 }
 
 var fileDescriptor_59a2f489dbd601ec = []byte{
-	// 1142 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x56, 0x5b, 0x6f, 0x13, 0x47,
-	0x14, 0xae, 0x9d, 0xc4, 0xb1, 0xcf, 0xc6, 0x4e, 0x18, 0x02, 0x18, 0x23, 0x28, 0x0d, 0x44, 0xa0,
-	0xaa, 0xac, 0x25, 0xd3, 0x56, 0xbd, 0x20, 0x51, 0x72, 0x81, 0xaa, 0x42, 0x40, 0x26, 0x69, 0xa3,
-	0xf6, 0x65, 0xb4, 0xde, 0x3d, 0x5e, 0x0f, 0xac, 0x77, 0xd6, 0xb3, 0xb3, 0x49, 0xac, 0x3e, 0xf7,
-	0x2f, 0xf4, 0xa5, 0x8f, 0x55, 0x7f, 0x55, 0xdf, 0xfb, 0x1b, 0xfa, 0x58, 0xcd, 0x65, 0x37, 0x26,
-	0xb8, 0x79, 0xdb, 0xf9, 0xce, 0xf7, 0xcd, 0x39, 0x73, 0x2e, 0x33, 0x0b, 0x7e, 0x2c, 0xfc, 0x70,
-	0x2c, 0xc5, 0x84, 0x17, 0x13, 0x5f, 0xc8, 0xb8, 0x9f, 0x14, 0x21, 0xef, 0x87, 0xd3, 0x7e, 0x90,
-	0xf1, 0x7e, 0x28, 0xd2, 0x11, 0x8f, 0xfb, 0x27, 0x83, 0x7e, 0x38, 0xf5, 0x33, 0x29, 0x94, 0x20,
-	0xad, 0x70, 0xea, 0x5b, 0xb8, 0x77, 0x27, 0x16, 0x22, 0x4e, 0xb0, 0x6f, 0x0c, 0xc3, 0x62, 0xd4,
-	0x8f, 0x0a, 0x19, 0x28, 0x2e, 0x52, 0x4b, 0xdd, 0xfa, 0xb3, 0x0e, 0x8d, 0x5d, 0x43, 0x25, 0x3e,
-	0x5c, 0x8d, 0x64, 0xc0, 0x53, 0x9e, 0xc6, 0x2c, 0x57, 0x81, 0x54, 0x4c, 0xf1, 0x09, 0x76, 0x6b,
-	0x77, 0x6b, 0x0f, 0x5b, 0xf4, 0x4a, 0x69, 0x3a, 0xd4, 0x96, 0x23, 0x3e, 0x41, 0x72, 0x1f, 0x3a,
-	0xe1, 0x54, 0x33, 0x55, 0x91, 0xb3, 0xb1, 0xc8, 0x55, 0xb7, 0x6e, 0xa8, 0x6b, 0xe1, 0xf4, 0xd0,
-	0x80, 0xdf, 0x8b, 0x5c, 0x91, 0xa7, 0xd0, 0xc9, 0x8b, 0xe1, 0x84, 0x2b, 0x26, 0x32, 0xed, 0x37,
-	0xef, 0x2e, 0xdd, 0xad, 0x3d, 0xf4, 0x06, 0x5d, 0xbf, 0x0a, 0xd2, 0x3f, 0x34, 0x84, 0xd7, 0xd6,
-	0x4e, 0xdb, 0xf9, 0xfc, 0x92, 0x7c, 0x0b, 0x6d, 0x4b, 0x63, 0xb1, 0x14, 0x45, 0x96, 0x77, 0x97,
-	0xef, 0x2e, 0x3d, 0xf4, 0x06, 0xd7, 0xe7, 0xf4, 0xf6, 0x00, 0x2f, 0xb4, 0x99, 0xae, 0x85, 0xe7,
-	0x8b, 0x9c, 0xec, 0xc3, 0x46, 0x38, 0x8d, 0x30, 0xc3, 0x34, 0xaa, 0xfc, 0xaf, 0x18, 0xff, 0xbd,
-	0x79, 0xfd, 0xc1, 0x9e, 0xa1, 0x94, 0x11, 0xac, 0x97, 0x1a, 0x07, 0x6c, 0x8d, 0xa1, 0xfd, 0x5e,
-	0x8c, 0xe4, 0x16, 0xb4, 0x26, 0xc1, 0x19, 0x1b, 0x16, 0x32, 0x57, 0x26, 0x43, 0x2b, 0xb4, 0x39,
-	0x09, 0xce, 0x76, 0xf4, 0x9a, 0x7c, 0x03, 0x9e, 0x31, 0xb0, 0x08, 0x93, 0x60, 0x66, 0xb2, 0xe2,
-	0x0d, 0x6e, 0xfa, 0xb6, 0x12, 0x7e, 0x59, 0x09, 0x7f, 0xcf, 0x55, 0x82, 0x82, 0x61, 0xef, 0x69,
-	0xf2, 0xd6, 0x53, 0x58, 0xbf, 0x10, 0x0d, 0xf9, 0x0c, 0x56, 0x83, 0x24, 0x11, 0xa7, 0x18, 0x19,
-	0x4f, 0x9d, 0x01, 0x99, 0x0b, 0xfd, 0x48, 0xf2, 0x34, 0x90, 0x33, 0x5a, 0x52, 0xb6, 0x7e, 0xaf,
-	0x83, 0x37, 0x97, 0x0f, 0xf2, 0x05, 0x34, 0x62, 0x94, 0x92, 0xeb, 0x30, 0x75, 0xde, 0x6e, 0x2f,
-	0xce, 0x9b, 0xff, 0xc2, 0x90, 0xa8, 0x23, 0x93, 0x01, 0xb4, 0x4e, 0x50, 0xf2, 0x11, 0x47, 0x99,
-	0xbb, 0x13, 0x6c, 0xce, 0x29, 0x7f, 0x2a, 0x6d, 0xf4, 0x9c, 0xd6, 0xfb, 0xa3, 0x06, 0x0d, 0xbb,
-	0x0d, 0xd9, 0x80, 0xa5, 0x42, 0x26, 0xae, 0x77, 0xf4, 0x27, 0x79, 0x06, 0xcd, 0x4c, 0x8a, 0xb7,
-	0x18, 0x2a, 0xbd, 0x9f, 0x8e, 0x64, 0xfb, 0xd2, 0x48, 0xfc, 0x37, 0x96, 0x4d, 0x2b, 0x59, 0xef,
-	0x09, 0xac, 0x3a, 0x90, 0x10, 0x58, 0x4e, 0x83, 0xaa, 0x39, 0xcd, 0x37, 0xb9, 0x0d, 0x20, 0x71,
-	0xc4, 0x24, 0xc6, 0x78, 0x96, 0x19, 0x1f, 0x2d, 0xda, 0x92, 0x38, 0xa2, 0x06, 0xd8, 0xfa, 0xc7,
-	0x83, 0x56, 0x15, 0x36, 0x79, 0x03, 0x57, 0xec, 0x49, 0x59, 0x38, 0x65, 0xc1, 0x90, 0x27, 0x5c,
-	0xcd, 0xcc, 0x6e, 0xde, 0xe0, 0xfe, 0xa2, 0x73, 0xba, 0xa8, 0x76, 0x0f, 0x9e, 0x59, 0x2e, 0x5d,
-	0xb7, 0xf2, 0xdd, 0xa9, 0x03, 0xc8, 0x77, 0xe0, 0x29, 0x89, 0xe8, 0x06, 0xc2, 0xe5, 0xec, 0xe3,
-	0x85, 0x7b, 0x1d, 0x49, 0x44, 0x3b, 0x22, 0x14, 0x54, 0xf5, 0x4d, 0x1e, 0x43, 0x43, 0xc9, 0xd9,
-	0x5b, 0x31, 0x74, 0x23, 0x72, 0xeb, 0x7f, 0xc4, 0x9a, 0x42, 0x1d, 0x95, 0x7c, 0x0d, 0xcd, 0x70,
-	0x9a, 0xf0, 0x54, 0xa1, 0xec, 0x2e, 0x1b, 0xd9, 0xed, 0x85, 0xb2, 0xdd, 0x83, 0x97, 0x86, 0x44,
-	0x2b, 0x3a, 0x79, 0x04, 0xcb, 0xa3, 0xe0, 0x1d, 0xba, 0x81, 0xb8, 0xb9, 0x50, 0xf6, 0x3c, 0x78,
-	0x87, 0xd4, 0xd0, 0x7a, 0x7f, 0xd5, 0x60, 0xfd, 0x42, 0x16, 0xc8, 0x36, 0x74, 0x42, 0x31, 0x99,
-	0x70, 0xa5, 0x50, 0xb2, 0x84, 0xe7, 0xb6, 0xcb, 0x5a, 0xb4, 0x5d, 0xa1, 0x2f, 0x79, 0xae, 0xc8,
-	0x23, 0x7d, 0xb5, 0xcc, 0x98, 0x2c, 0x52, 0x16, 0x84, 0x21, 0xe6, 0xb9, 0xe5, 0xda, 0x1a, 0x6d,
-	0x44, 0x72, 0x46, 0x8b, 0xf4, 0x99, 0x31, 0x18, 0xfa, 0x13, 0xb8, 0x65, 0xda, 0x99, 0xb9, 0x9b,
-	0xe3, 0x94, 0xab, 0x31, 0x13, 0x19, 0xa6, 0x2c, 0xc2, 0xcc, 0x5e, 0x20, 0x4d, 0x7a, 0xc3, 0x50,
-	0xec, 0x58, 0x1e, 0x73, 0x35, 0x7e, 0x9d, 0x61, 0xba, 0x87, 0x59, 0xde, 0xbb, 0x03, 0x70, 0x9e,
-	0xe0, 0x0f, 0x3b, 0xb1, 0xf7, 0x6f, 0x03, 0x1a, 0x36, 0x89, 0xe4, 0x29, 0x34, 0x87, 0x05, 0x4f,
-	0x22, 0xdd, 0xe4, 0x76, 0x3c, 0xee, 0x5d, 0x92, 0x73, 0x7f, 0xc7, 0x72, 0x69, 0x25, 0x22, 0x3f,
-	0xc0, 0x9a, 0x44, 0x25, 0x67, 0xcc, 0x4a, 0x5c, 0xd5, 0x1f, 0x5c, 0xb6, 0x09, 0xd5, 0x7c, 0xdb,
-	0xef, 0xd4, 0x93, 0xe7, 0x8b, 0xde, 0x6f, 0x4b, 0xb0, 0xea, 0x3c, 0x2c, 0xec, 0xef, 0x7b, 0xd0,
-	0x8e, 0x78, 0x1e, 0x0c, 0x13, 0x64, 0x12, 0x8b, 0x1c, 0x8d, 0xb3, 0x26, 0x5d, 0x73, 0x20, 0xd5,
-	0x18, 0xf9, 0x04, 0xd6, 0x94, 0xe4, 0x71, 0x8c, 0x12, 0x23, 0x36, 0x9c, 0x99, 0x5c, 0xb5, 0xa8,
-	0x57, 0x61, 0x3b, 0x33, 0xf2, 0x18, 0xae, 0xe1, 0x59, 0x86, 0x92, 0x4f, 0x30, 0x55, 0x2c, 0x43,
-	0x19, 0x62, 0xaa, 0x82, 0x18, 0x4d, 0xfb, 0xd4, 0xe9, 0xe6, 0xb9, 0xf1, 0x4d, 0x65, 0x23, 0x14,
-	0xda, 0x38, 0x2d, 0xf8, 0x49, 0x90, 0x68, 0x91, 0x12, 0xae, 0x69, 0x1e, 0x5d, 0x76, 0xd2, 0xfd,
-	0x4a, 0x50, 0x26, 0x6e, 0xed, 0x7c, 0x8f, 0x23, 0x41, 0x1e, 0xc0, 0x7a, 0x22, 0x42, 0x73, 0x07,
-	0x96, 0x53, 0xdb, 0x30, 0x1d, 0xd1, 0x29, 0x61, 0x3b, 0xba, 0xe4, 0x4b, 0xb8, 0x71, 0x81, 0xc8,
-	0xf0, 0x2c, 0x4c, 0x8a, 0x08, 0xbb, 0xab, 0x46, 0x70, 0xed, 0x7d, 0xc1, 0xbe, 0x35, 0x92, 0xcf,
-	0xe1, 0xba, 0x38, 0x4d, 0x51, 0xe6, 0xec, 0x74, 0xcc, 0x15, 0xea, 0x9e, 0xb3, 0x8f, 0x48, 0xb7,
-	0x69, 0x64, 0x9b, 0xd6, 0x7a, 0x5c, 0x1a, 0xcd, 0xfd, 0xd3, 0xfb, 0x15, 0xae, 0x7c, 0x10, 0xf9,
-	0xc2, 0x82, 0xdc, 0x01, 0x98, 0xcb, 0x5e, 0xdd, 0x64, 0x6f, 0x0e, 0x21, 0x03, 0xb8, 0x66, 0x1c,
-	0x7c, 0xe0, 0xdd, 0x16, 0xe5, 0xaa, 0x31, 0x5e, 0x70, 0xfe, 0x77, 0x0d, 0xbc, 0xb9, 0x0e, 0xd1,
-	0xf5, 0xcc, 0x79, 0x1a, 0x27, 0xc8, 0xa6, 0x85, 0x50, 0x81, 0x7b, 0x6b, 0x3c, 0x8b, 0x1d, 0x68,
-	0x48, 0x53, 0xe2, 0x44, 0x0c, 0x83, 0xc4, 0x51, 0xea, 0x96, 0x62, 0x31, 0x4b, 0xd9, 0x86, 0xce,
-	0x28, 0xe0, 0x49, 0x21, 0x91, 0x9d, 0x22, 0x8f, 0xc7, 0xca, 0x84, 0xb0, 0x42, 0xdb, 0x0e, 0x3d,
-	0x36, 0x20, 0xf9, 0x0a, 0xba, 0x4a, 0x06, 0x69, 0xce, 0x75, 0x8d, 0x2f, 0x08, 0x96, 0x8d, 0xe0,
-	0x7a, 0x65, 0x7f, 0xfe, 0x9e, 0x72, 0x1b, 0x3a, 0xfa, 0x67, 0x41, 0x14, 0xaa, 0xe4, 0xaf, 0x58,
-	0x07, 0x0e, 0xb5, 0xb4, 0x1e, 0x40, 0xb3, 0xbc, 0x87, 0x7a, 0xc7, 0xb0, 0xac, 0x2f, 0x97, 0x85,
-	0x99, 0xdd, 0x86, 0x0e, 0x9e, 0x60, 0xaa, 0x8a, 0x20, 0x31, 0xf7, 0x29, 0xba, 0x5f, 0x8b, 0x76,
-	0x89, 0xea, 0xe1, 0x46, 0xb2, 0x09, 0x2b, 0xf6, 0x89, 0xb5, 0xa7, 0xb1, 0x8b, 0x4f, 0xb7, 0x61,
-	0xd5, 0xbd, 0x8a, 0xa4, 0x05, 0x2b, 0x3f, 0xbe, 0x3a, 0xdc, 0x3f, 0xda, 0xf8, 0x88, 0xac, 0xc2,
-	0xd2, 0xcf, 0xfb, 0x87, 0x1b, 0x35, 0xd2, 0x80, 0xfa, 0xab, 0xd7, 0x1b, 0xf5, 0x9d, 0xe6, 0x2f,
-	0x0d, 0xdb, 0xb8, 0xc3, 0x86, 0x79, 0x92, 0x1f, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x15, 0x23,
-	0x8f, 0xf3, 0x67, 0x09, 0x00, 0x00,
+	// 1140 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x56, 0x5d, 0x6f, 0xdb, 0x36,
+	0x17, 0x7e, 0xed, 0x24, 0x8e, 0x7d, 0x14, 0x3b, 0x2e, 0x9b, 0xb6, 0x7e, 0x5d, 0xb4, 0xeb, 0xd2,
+	0x1a, 0x2d, 0x86, 0x55, 0x06, 0xdc, 0x6d, 0xd8, 0x47, 0x81, 0xae, 0xf9, 0x68, 0x87, 0xa1, 0x68,
+	0x1b, 0x26, 0x5b, 0xb0, 0xdd, 0x10, 0xb2, 0x74, 0x2c, 0xb3, 0x95, 0x45, 0x99, 0xa2, 0x92, 0x18,
+	0xbb, 0xde, 0xaf, 0xd8, 0xf5, 0x7e, 0xd5, 0xb6, 0xdb, 0xfd, 0x86, 0x5d, 0x0e, 0x24, 0x25, 0xd9,
+	0x75, 0xbc, 0xdc, 0x89, 0xcf, 0x79, 0x1e, 0x1e, 0x9e, 0x2f, 0x52, 0xe0, 0x86, 0xc2, 0xf5, 0xc7,
+	0x52, 0x4c, 0x78, 0x36, 0x71, 0x85, 0x0c, 0xfb, 0x51, 0xe6, 0xf3, 0xbe, 0x3f, 0xed, 0x7b, 0x09,
+	0xef, 0xfb, 0x22, 0x1e, 0xf1, 0xb0, 0x7f, 0x36, 0xe8, 0xfb, 0x53, 0x37, 0x91, 0x42, 0x09, 0xd2,
+	0xf0, 0xa7, 0xae, 0x85, 0xbb, 0x77, 0x43, 0x21, 0xc2, 0x08, 0xfb, 0xc6, 0x30, 0xcc, 0x46, 0xfd,
+	0x20, 0x93, 0x9e, 0xe2, 0x22, 0xb6, 0xd4, 0xdd, 0x3f, 0x2b, 0x50, 0xdb, 0x37, 0x54, 0xe2, 0xc2,
+	0xf5, 0x40, 0x7a, 0x3c, 0xe6, 0x71, 0xc8, 0x52, 0xe5, 0x49, 0xc5, 0x14, 0x9f, 0x60, 0xa7, 0x72,
+	0xaf, 0xf2, 0xa8, 0x41, 0xaf, 0x15, 0xa6, 0x63, 0x6d, 0x39, 0xe1, 0x13, 0x24, 0x0f, 0xa0, 0xe5,
+	0x4f, 0x35, 0x53, 0x65, 0x29, 0x1b, 0x8b, 0x54, 0x75, 0xaa, 0x86, 0xba, 0xe5, 0x4f, 0x8f, 0x0d,
+	0xf8, 0x9d, 0x48, 0x15, 0x79, 0x06, 0xad, 0x34, 0x1b, 0x4e, 0xb8, 0x62, 0x22, 0xd1, 0x7e, 0xd3,
+	0xce, 0xda, 0xbd, 0xca, 0x23, 0x67, 0xd0, 0x71, 0xcb, 0x43, 0xba, 0xc7, 0x86, 0xf0, 0xc6, 0xda,
+	0x69, 0x33, 0x5d, 0x5c, 0x92, 0x6f, 0xa0, 0x69, 0x69, 0x2c, 0x94, 0x22, 0x4b, 0xd2, 0xce, 0xfa,
+	0xbd, 0xb5, 0x47, 0xce, 0xe0, 0xe6, 0x82, 0xde, 0x06, 0xf0, 0x52, 0x9b, 0xe9, 0x96, 0x3f, 0x5f,
+	0xa4, 0xbb, 0x63, 0x68, 0x7e, 0xb0, 0x39, 0xb9, 0x0d, 0x8d, 0x89, 0x77, 0xc1, 0x86, 0x99, 0x4c,
+	0x95, 0x09, 0x6d, 0x83, 0xd6, 0x27, 0xde, 0xc5, 0x9e, 0x5e, 0x93, 0xaf, 0xc1, 0x31, 0x06, 0x16,
+	0x60, 0xe4, 0xcd, 0x4c, 0x38, 0xce, 0xe0, 0xff, 0xae, 0x4d, 0xa1, 0x5b, 0xa4, 0xd0, 0x3d, 0xc8,
+	0x53, 0x48, 0xc1, 0xb0, 0x0f, 0x34, 0x79, 0xf7, 0xaf, 0x2a, 0x38, 0x0b, 0xe7, 0x20, 0x9f, 0x43,
+	0x2d, 0x44, 0x29, 0xb9, 0xf6, 0xa2, 0xcf, 0x7b, 0x67, 0xf5, 0x79, 0xdd, 0x97, 0x86, 0x44, 0x73,
+	0x32, 0x39, 0x84, 0xb6, 0x3f, 0x0d, 0x30, 0xc1, 0x38, 0x58, 0x4a, 0x58, 0x77, 0x71, 0x83, 0xa3,
+	0x03, 0x43, 0x29, 0x52, 0xb6, 0x5d, 0x68, 0x8a, 0x30, 0x07, 0xd0, 0x38, 0x43, 0xc9, 0x47, 0x1c,
+	0x65, 0x9a, 0xc7, 0xb1, 0xb3, 0xa0, 0xff, 0xb1, 0xb0, 0xd1, 0x39, 0xad, 0xfb, 0x5b, 0x05, 0x6a,
+	0xf6, 0x34, 0xa4, 0x0d, 0x6b, 0x99, 0x8c, 0xf2, 0xd2, 0xeb, 0x4f, 0xf2, 0x1c, 0xea, 0x89, 0x14,
+	0xef, 0xd0, 0x57, 0x7a, 0x3f, 0x1d, 0x50, 0xef, 0xca, 0x80, 0xdc, 0xb7, 0x96, 0x4d, 0x4b, 0x59,
+	0xf7, 0x29, 0x6c, 0xe6, 0x20, 0x21, 0xb0, 0x1e, 0x7b, 0x65, 0x6f, 0x99, 0x6f, 0x72, 0x07, 0x40,
+	0xe2, 0x88, 0x49, 0x0c, 0xf1, 0x22, 0x31, 0x3e, 0x1a, 0xb4, 0x21, 0x71, 0x44, 0x0d, 0xb0, 0xfb,
+	0x0c, 0xb6, 0x97, 0xa2, 0x26, 0x9f, 0xc2, 0xa6, 0x17, 0x45, 0xe2, 0x1c, 0x03, 0xb3, 0x51, 0x6b,
+	0x40, 0x16, 0x8e, 0x74, 0x22, 0x79, 0xec, 0xc9, 0x19, 0x2d, 0x28, 0xbb, 0x7f, 0x3b, 0xd0, 0x28,
+	0xe3, 0x26, 0x6f, 0xe1, 0x9a, 0xcd, 0x38, 0xf3, 0xa7, 0xcc, 0x1b, 0xf2, 0x88, 0xab, 0x99, 0xd9,
+	0xc5, 0x19, 0x3c, 0x58, 0x95, 0xa8, 0x3c, 0xac, 0xfd, 0xa3, 0xe7, 0x96, 0x4b, 0xb7, 0xad, 0x7c,
+	0x7f, 0x9a, 0x03, 0xe4, 0x5b, 0x70, 0x94, 0x44, 0xcc, 0x07, 0x22, 0x4f, 0xfa, 0x47, 0x2b, 0xf7,
+	0x3a, 0x91, 0x88, 0x76, 0x44, 0x28, 0xa8, 0xf2, 0x9b, 0x3c, 0x81, 0x9a, 0x92, 0xb3, 0x77, 0x62,
+	0x98, 0x57, 0xfc, 0xf6, 0x7f, 0x88, 0x35, 0x85, 0xe6, 0x54, 0xf2, 0x15, 0xd4, 0xfd, 0x69, 0xc4,
+	0x63, 0x85, 0xb2, 0xb3, 0x6e, 0x64, 0x77, 0x56, 0xca, 0xf6, 0x8f, 0x5e, 0x19, 0x12, 0x2d, 0xe9,
+	0xe4, 0x31, 0xac, 0x8f, 0xbc, 0xf7, 0xd8, 0xd9, 0xc8, 0xfb, 0x7c, 0x95, 0xec, 0x85, 0xf7, 0x1e,
+	0xa9, 0xa1, 0x75, 0x7f, 0xaf, 0xc0, 0xf6, 0x52, 0x16, 0x48, 0x0f, 0x5a, 0xbe, 0x98, 0x4c, 0xb8,
+	0x52, 0x28, 0x59, 0xc4, 0x53, 0xdb, 0xed, 0x0d, 0xda, 0x2c, 0xd1, 0x57, 0x3c, 0x55, 0xe4, 0xb1,
+	0xbe, 0x5a, 0x66, 0x4c, 0x66, 0x31, 0xf3, 0x7c, 0x1f, 0xd3, 0xd4, 0x72, 0x6d, 0x91, 0xdb, 0x81,
+	0x9c, 0xd1, 0x2c, 0x7e, 0x6e, 0x0c, 0x86, 0xfe, 0x14, 0x6e, 0x9b, 0xaa, 0xb1, 0xfc, 0xe6, 0x38,
+	0xe7, 0x6a, 0xcc, 0x44, 0x82, 0x31, 0x0b, 0x30, 0xb1, 0xf3, 0x50, 0xa7, 0xb7, 0x0c, 0xc5, 0x4e,
+	0xf7, 0x29, 0x57, 0xe3, 0x37, 0x09, 0xc6, 0x07, 0x98, 0xa4, 0xdd, 0xbb, 0x00, 0xf3, 0x04, 0x5f,
+	0x6e, 0xe5, 0xee, 0x3f, 0x35, 0xa8, 0xd9, 0x24, 0x92, 0x67, 0x50, 0x1f, 0x66, 0x3c, 0x0a, 0xf4,
+	0x94, 0xd8, 0x31, 0xbd, 0x7f, 0x45, 0xce, 0xdd, 0x3d, 0xcb, 0xa5, 0xa5, 0x88, 0x7c, 0x0f, 0x5b,
+	0x12, 0x95, 0x9c, 0x31, 0x2b, 0xc9, 0xab, 0xfe, 0xf0, 0xaa, 0x4d, 0xa8, 0xe6, 0xdb, 0x81, 0xa1,
+	0x8e, 0x9c, 0x2f, 0xba, 0xbf, 0xae, 0xc1, 0x66, 0xee, 0x61, 0xe5, 0x80, 0xdc, 0x87, 0x66, 0xc0,
+	0x53, 0x6f, 0x18, 0x21, 0x93, 0x98, 0xa5, 0x68, 0x9c, 0xd5, 0xe9, 0x56, 0x0e, 0x52, 0x8d, 0x91,
+	0x8f, 0x61, 0x4b, 0x49, 0x1e, 0x86, 0x28, 0x31, 0x60, 0xc3, 0x99, 0xc9, 0x55, 0x83, 0x3a, 0x25,
+	0xb6, 0x37, 0x23, 0x4f, 0xe0, 0x06, 0x5e, 0x24, 0x28, 0xf9, 0x04, 0x63, 0xc5, 0x12, 0x94, 0x3e,
+	0xc6, 0xca, 0x0b, 0xd1, 0xb4, 0x4f, 0x95, 0xee, 0xcc, 0x8d, 0x6f, 0x4b, 0x1b, 0xa1, 0xd0, 0xc4,
+	0x69, 0xc6, 0xcf, 0xbc, 0x48, 0x8b, 0x94, 0xc8, 0x9b, 0xe6, 0xf1, 0x55, 0x91, 0x1e, 0x96, 0x82,
+	0x22, 0x71, 0x5b, 0xf3, 0x3d, 0x4e, 0x04, 0x79, 0x08, 0xdb, 0x91, 0xf0, 0xcd, 0x55, 0x5a, 0x8c,
+	0x7d, 0xcd, 0x74, 0x44, 0xab, 0x80, 0xed, 0xec, 0x93, 0x2f, 0xe0, 0xd6, 0x12, 0x91, 0xe1, 0x85,
+	0x1f, 0x65, 0x01, 0x76, 0x36, 0x8d, 0xe0, 0xc6, 0x87, 0x82, 0x43, 0x6b, 0x24, 0x9f, 0xc1, 0x4d,
+	0x71, 0x1e, 0xa3, 0x4c, 0xd9, 0xf9, 0x98, 0x2b, 0xd4, 0x3d, 0x67, 0x1f, 0x91, 0x4e, 0xdd, 0xc8,
+	0x76, 0xac, 0xf5, 0xb4, 0x30, 0x9a, 0x0b, 0xac, 0xfb, 0x0b, 0x5c, 0xbb, 0x74, 0xf2, 0x95, 0x05,
+	0xb9, 0x0b, 0xb0, 0x90, 0xbd, 0xaa, 0xc9, 0xde, 0x02, 0x42, 0x06, 0x70, 0xc3, 0x38, 0xb8, 0xe4,
+	0xdd, 0x16, 0xe5, 0xba, 0x31, 0x2e, 0x39, 0xff, 0xa3, 0x02, 0xce, 0x42, 0x87, 0xe8, 0x7a, 0xa6,
+	0x3c, 0x0e, 0x23, 0x64, 0xd3, 0x4c, 0x28, 0x2f, 0x7f, 0xb2, 0x1c, 0x8b, 0x1d, 0x69, 0x48, 0x53,
+	0xc2, 0x48, 0x0c, 0xbd, 0x28, 0xa7, 0x54, 0x2d, 0xc5, 0x62, 0x96, 0xd2, 0x83, 0xd6, 0xc8, 0xe3,
+	0x51, 0x26, 0x91, 0x9d, 0x23, 0x0f, 0xc7, 0xca, 0x1c, 0x61, 0x83, 0x36, 0x73, 0xf4, 0xd4, 0x80,
+	0xe4, 0x4b, 0xe8, 0x28, 0xe9, 0xc5, 0x29, 0xd7, 0x35, 0x5e, 0x12, 0xac, 0x1b, 0xc1, 0xcd, 0xd2,
+	0xfe, 0xe2, 0x03, 0x65, 0x0f, 0x5a, 0xfa, 0x67, 0x41, 0x64, 0xaa, 0xe0, 0x6f, 0x58, 0x07, 0x39,
+	0x6a, 0x69, 0x5d, 0x80, 0x7a, 0x71, 0x0f, 0x75, 0x4f, 0x61, 0x5d, 0x5f, 0x2e, 0x2b, 0x33, 0xdb,
+	0x83, 0x16, 0x9e, 0x61, 0xac, 0x32, 0x2f, 0x32, 0xf7, 0x29, 0xe6, 0xbf, 0x16, 0xcd, 0x02, 0xd5,
+	0xc3, 0x8d, 0x64, 0x07, 0x36, 0xec, 0x4b, 0x6d, 0xa3, 0xb1, 0x8b, 0x4f, 0x7a, 0xb0, 0x99, 0x5f,
+	0xfe, 0xa4, 0x01, 0x1b, 0x3f, 0xbc, 0x3e, 0x3e, 0x3c, 0x69, 0xff, 0x8f, 0x6c, 0xc2, 0xda, 0x4f,
+	0x87, 0xc7, 0xed, 0x0a, 0xa9, 0x41, 0xf5, 0xf5, 0x9b, 0x76, 0x75, 0xaf, 0xfe, 0x73, 0xcd, 0x36,
+	0xee, 0xb0, 0x66, 0x5e, 0xf6, 0x27, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xac, 0x0f, 0xe5, 0x1c,
+	0x67, 0x09, 0x00, 0x00,
 }
diff --git a/cq/api/config/v2/cq.proto b/cq/api/config/v2/cq.proto
index 9656a9e..816cf7f 100644
--- a/cq/api/config/v2/cq.proto
+++ b/cq/api/config/v2/cq.proto
@@ -41,9 +41,6 @@
 
   // At least 1 ConfigGroup is required.
   repeated ConfigGroup config_groups = 4;
-
-  // EXPERIMENTAL!
-  CQDependOptions cqdepend_options = 5;
 }
 
 // SubmitOptions control how CQ submits CLs.
@@ -73,11 +70,6 @@
 }
 
 
-// EXPERIMENTAL! TODO(tandrii, crbug/912294): add doc.
-message CQDependOptions {
-  Trinary allowed = 1;
-}
-
 // ConfigGroup allows one to share single verifiers config across a set of
 // Gerrit repositories, which may be in different Gerrit installations.
 message ConfigGroup {
@@ -128,10 +120,18 @@
   // At least 1 Gerrit instance with repositories to work with is required.
   repeated Gerrit gerrit = 1;
 
+  // EXPERIMENTAL!
+  CQDependOptions cqdepend_options = 3;
+
   // Defines how to verify a CL before submitting it. Required.
   Verifiers verifiers = 2;
 }
 
+// EXPERIMENTAL! TODO(tandrii, crbug/912294): add doc.
+message CQDependOptions {
+  Trinary allowed = 1;
+}
+
 // Verifiers are various types of checks that a Commit Queue performs on a CL.
 // All verifiers must pass in order for a CL to be submitted. Configuration file
 // describes types of verifiers that should be applied to each CL and their