diff --git a/go/api/hardware_topology.pb.go b/go/api/hardware_topology.pb.go
index 5e52a08..bc6ec06 100644
--- a/go/api/hardware_topology.pb.go
+++ b/go/api/hardware_topology.pb.go
@@ -95,7 +95,10 @@
 	VolumeButton *Topology `protobuf:"bytes,21,opt,name=volume_button,json=volumeButton,proto3" json:"volume_button,omitempty"`
 	// Specify the EC topology.
 	// See ./hardware_topology.md#ec for more information.
-	Ec                   *Topology `protobuf:"bytes,22,opt,name=ec,proto3" json:"ec,omitempty"`
+	Ec *Topology `protobuf:"bytes,22,opt,name=ec,proto3" json:"ec,omitempty"`
+	// Specify the touch topology.
+	// See ./hardware_topology.md#touch for more information.
+	Touch                *Topology `protobuf:"bytes,23,opt,name=touch,proto3" json:"touch,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
 	XXX_unrecognized     []byte    `json:"-"`
 	XXX_sizecache        int32     `json:"-"`
@@ -280,6 +283,13 @@
 	return nil
 }
 
+func (m *HardwareTopology) GetTouch() *Topology {
+	if m != nil {
+		return m.Touch
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*HardwareTopology)(nil), "chromiumos.config.api.HardwareTopology")
 }
@@ -289,39 +299,40 @@
 }
 
 var fileDescriptor_9e326e49764ac0fb = []byte{
-	// 533 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x4d, 0x6f, 0xd3, 0x40,
-	0x10, 0x86, 0xd5, 0xb4, 0x4d, 0x9b, 0xc9, 0x27, 0x4b, 0x8b, 0x56, 0x5c, 0x40, 0x55, 0x0f, 0x15,
-	0x12, 0x8e, 0xa0, 0x42, 0x08, 0x51, 0x04, 0x44, 0xa8, 0x54, 0x48, 0x1c, 0x68, 0x81, 0x03, 0x17,
-	0x6b, 0x6d, 0x4f, 0x9c, 0xa5, 0xb6, 0xc7, 0x8c, 0xd7, 0x0d, 0xf9, 0x5f, 0xfc, 0x40, 0xe4, 0xb5,
-	0xf3, 0x51, 0xb5, 0x87, 0xbd, 0xda, 0xef, 0xf3, 0xec, 0x8c, 0x66, 0x34, 0xf0, 0x3c, 0x9c, 0x31,
-	0xa5, 0xba, 0x4c, 0xa9, 0x18, 0x87, 0x94, 0x4d, 0x75, 0x3c, 0x56, 0xb9, 0x1e, 0xcf, 0x14, 0x47,
-	0x73, 0xc5, 0xe8, 0x1b, 0xca, 0x29, 0xa1, 0x78, 0xe1, 0xe5, 0x4c, 0x86, 0xc4, 0xe1, 0x3a, 0xee,
-	0xd5, 0x71, 0x4f, 0xe5, 0xfa, 0xf1, 0xf1, 0xfd, 0x96, 0xdb, 0xf0, 0xd1, 0xbf, 0x2e, 0x8c, 0x2e,
-	0x1a, 0xf1, 0xf7, 0xe6, 0x97, 0x78, 0x0d, 0xed, 0x22, 0x64, 0xc4, 0x4c, 0x6e, 0x3d, 0xdd, 0x3a,
-	0xe9, 0xbe, 0x7c, 0xe2, 0xdd, 0xfb, 0x84, 0xb7, 0x04, 0x2e, 0x9b, 0xb8, 0xf8, 0x00, 0xdd, 0x29,
-	0x71, 0xea, 0x4f, 0x55, 0x68, 0x88, 0x65, 0xcb, 0x8d, 0x86, 0x8a, 0x39, 0xb7, 0x88, 0x78, 0x05,
-	0xbb, 0xaa, 0x8c, 0x34, 0xc9, 0x6d, 0x37, 0xb6, 0x4e, 0xdb, 0x8a, 0xcd, 0x22, 0x29, 0x0b, 0xb9,
-	0xe3, 0x5a, 0xb1, 0x8d, 0x8b, 0xb7, 0xb0, 0x7f, 0x8d, 0x8b, 0x80, 0x14, 0x47, 0x72, 0xd7, 0x0d,
-	0x5d, 0x01, 0xe2, 0x0d, 0xec, 0x99, 0x19, 0x72, 0xaa, 0x12, 0xd9, 0x76, 0x63, 0x97, 0xf9, 0xaa,
-	0xe0, 0x50, 0xa5, 0xc8, 0x4a, 0xee, 0x39, 0x16, 0x5c, 0xc7, 0xc5, 0x1f, 0x38, 0x56, 0x61, 0x88,
-	0x09, 0x32, 0xa5, 0x68, 0x90, 0xfd, 0x78, 0xc1, 0x54, 0x84, 0x94, 0xa3, 0x9f, 0xaa, 0x38, 0x43,
-	0x53, 0x7f, 0x96, 0xfb, 0x6e, 0xda, 0xa3, 0x5b, 0xb2, 0xcf, 0x4b, 0xd7, 0xd7, 0x0d, 0x95, 0xf8,
-	0x08, 0xdd, 0xa9, 0xce, 0x62, 0xe4, 0x9c, 0x75, 0x66, 0x64, 0xc7, 0xcd, 0xbc, 0xc9, 0x88, 0x2f,
-	0x30, 0xca, 0x99, 0xfe, 0xea, 0x54, 0x9b, 0x85, 0x5f, 0x60, 0x56, 0x10, 0x4b, 0x70, 0xf3, 0x0c,
-	0x57, 0xe0, 0x95, 0xe5, 0xc4, 0x39, 0x0c, 0x22, 0x55, 0xc6, 0xb3, 0xaa, 0xf9, 0x7a, 0x70, 0x5d,
-	0x37, 0x53, 0x7f, 0x89, 0x4d, 0xec, 0xf4, 0xbe, 0xc1, 0x41, 0x46, 0x99, 0x7f, 0x43, 0x89, 0x32,
-	0x3a, 0x41, 0xbf, 0x30, 0xc4, 0x2a, 0x46, 0xd9, 0x73, 0xb3, 0x89, 0x8c, 0xb2, 0x9f, 0x0d, 0x7b,
-	0x55, 0xa3, 0xe2, 0x05, 0x6c, 0xb3, 0x4a, 0x65, 0xdf, 0xcd, 0x50, 0x65, 0xc5, 0x29, 0xec, 0xcc,
-	0xf5, 0x54, 0xcb, 0x81, 0x1b, 0x63, 0xc3, 0xe2, 0x0c, 0x3a, 0x89, 0xc1, 0xa6, 0xfb, 0xa1, 0xe3,
-	0xda, 0x26, 0x06, 0xeb, 0xc6, 0xcf, 0xa0, 0x53, 0x44, 0x3e, 0xa3, 0x8a, 0x90, 0xe5, 0xc8, 0x91,
-	0x2e, 0xa2, 0x4b, 0x0b, 0x88, 0x0b, 0x18, 0xa6, 0x54, 0xad, 0xb1, 0x7d, 0xdd, 0x2f, 0x8b, 0x40,
-	0x3e, 0x70, 0x73, 0x0c, 0x36, 0xb8, 0x1f, 0x45, 0x20, 0xde, 0x41, 0x27, 0x48, 0x4a, 0x34, 0x44,
-	0x66, 0x26, 0x85, 0x9b, 0x63, 0x4d, 0x88, 0xf7, 0x00, 0x81, 0x62, 0xc6, 0xe4, 0xb7, 0x0a, 0xaf,
-	0xe5, 0x43, 0xc7, 0x5b, 0xb3, 0x46, 0xc4, 0x04, 0x7a, 0x39, 0xcd, 0xab, 0x2d, 0x2a, 0x8d, 0xa1,
-	0x4c, 0x1e, 0x38, 0x2e, 0xb6, 0x85, 0x26, 0x96, 0x11, 0x9f, 0xa0, 0x7f, 0x43, 0x49, 0x99, 0xe2,
-	0x52, 0x72, 0xe8, 0x26, 0xe9, 0xd5, 0x54, 0x63, 0x19, 0x43, 0x0b, 0x43, 0xf9, 0xc8, 0x0d, 0x6d,
-	0x61, 0x38, 0x79, 0xf6, 0xeb, 0x24, 0xa6, 0x55, 0xd0, 0x23, 0x8e, 0xc7, 0x77, 0xcf, 0x7d, 0x4c,
-	0xd5, 0xc5, 0x0f, 0xda, 0xf6, 0xd2, 0x9f, 0xfe, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x63, 0xd9,
-	0x1f, 0x57, 0x06, 0x00, 0x00,
+	// 545 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0x4b, 0x6f, 0xd4, 0x30,
+	0x10, 0xc7, 0xd5, 0x77, 0x77, 0xb6, 0x8f, 0xc5, 0xb4, 0x60, 0x71, 0x01, 0x55, 0x3d, 0x54, 0x48,
+	0x64, 0x05, 0x15, 0x42, 0x88, 0x22, 0x60, 0x85, 0x4a, 0x85, 0xc4, 0x81, 0x16, 0x38, 0x70, 0x89,
+	0x1c, 0x67, 0x36, 0x31, 0x4d, 0x32, 0x61, 0xe2, 0x74, 0xd9, 0xcf, 0xcc, 0x97, 0x40, 0x71, 0xb2,
+	0x8f, 0x8a, 0x1e, 0x7c, 0x4d, 0xfe, 0xbf, 0x9f, 0xc7, 0xf2, 0x68, 0x06, 0x9e, 0xe9, 0x94, 0x29,
+	0x37, 0x75, 0x4e, 0xd5, 0x50, 0x53, 0x31, 0x36, 0xc9, 0x50, 0x95, 0x66, 0x98, 0x2a, 0x8e, 0x27,
+	0x8a, 0x31, 0xb4, 0x54, 0x52, 0x46, 0xc9, 0x34, 0x28, 0x99, 0x2c, 0x89, 0xc3, 0x45, 0x3c, 0x68,
+	0xe3, 0x81, 0x2a, 0xcd, 0xa3, 0xe3, 0xbb, 0x2d, 0xb7, 0xe1, 0xa3, 0xbf, 0x7d, 0x18, 0x5c, 0x74,
+	0xe2, 0x6f, 0xdd, 0x2f, 0xf1, 0x0a, 0x36, 0x2b, 0xcd, 0x88, 0x85, 0x5c, 0x79, 0xb2, 0x72, 0xd2,
+	0x7f, 0xf1, 0x38, 0xb8, 0xf3, 0x88, 0x60, 0x06, 0x5c, 0x76, 0x71, 0xf1, 0x1e, 0xfa, 0x63, 0xe2,
+	0x3c, 0x1c, 0x2b, 0x6d, 0x89, 0xe5, 0xaa, 0x1f, 0x0d, 0x0d, 0x73, 0xee, 0x10, 0xf1, 0x12, 0x36,
+	0x54, 0x1d, 0x1b, 0x92, 0x6b, 0x7e, 0x6c, 0x9b, 0x76, 0x15, 0xdb, 0x69, 0x56, 0x57, 0x72, 0xdd,
+	0xb7, 0x62, 0x17, 0x17, 0x6f, 0x60, 0xfb, 0x1a, 0xa7, 0x11, 0x29, 0x8e, 0xe5, 0x86, 0x1f, 0x3a,
+	0x07, 0xc4, 0x6b, 0xd8, 0xb2, 0x29, 0x72, 0xae, 0x32, 0xb9, 0xe9, 0xc7, 0xce, 0xf2, 0x4d, 0xc1,
+	0x5a, 0xe5, 0xc8, 0x4a, 0x6e, 0x79, 0x16, 0xdc, 0xc6, 0xc5, 0x6f, 0x38, 0x56, 0x5a, 0x63, 0x86,
+	0x4c, 0x39, 0x5a, 0xe4, 0x30, 0x99, 0x32, 0x55, 0x9a, 0x4a, 0x0c, 0x73, 0x95, 0x14, 0x68, 0xdb,
+	0xcf, 0x72, 0xdb, 0x4f, 0x7b, 0x74, 0x4b, 0xf6, 0x69, 0xe6, 0xfa, 0xb2, 0xa4, 0x12, 0x1f, 0xa0,
+	0x3f, 0x36, 0x45, 0x82, 0x5c, 0xb2, 0x29, 0xac, 0xec, 0xf9, 0x99, 0x97, 0x19, 0xf1, 0x19, 0x06,
+	0x25, 0xd3, 0x1f, 0x93, 0x1b, 0x3b, 0x0d, 0x2b, 0x2c, 0x2a, 0x62, 0x09, 0x7e, 0x9e, 0xfd, 0x39,
+	0x78, 0xe5, 0x38, 0x71, 0x0e, 0x7b, 0xb1, 0xaa, 0x93, 0xb4, 0xb9, 0x7c, 0xfb, 0x70, 0x7d, 0x3f,
+	0xd3, 0xee, 0x0c, 0x1b, 0xb9, 0xd7, 0xfb, 0x0a, 0x07, 0x05, 0x15, 0xe1, 0x0d, 0x65, 0xca, 0x9a,
+	0x0c, 0xc3, 0xca, 0x12, 0xab, 0x04, 0xe5, 0x8e, 0x9f, 0x4d, 0x14, 0x54, 0xfc, 0xe8, 0xd8, 0xab,
+	0x16, 0x15, 0xcf, 0x61, 0x8d, 0x55, 0x2e, 0x77, 0xfd, 0x0c, 0x4d, 0x56, 0x9c, 0xc2, 0xfa, 0xc4,
+	0x8c, 0x8d, 0xdc, 0xf3, 0x63, 0x5c, 0x58, 0x9c, 0x41, 0x2f, 0xb3, 0xd8, 0xdd, 0x7e, 0xdf, 0xb3,
+	0x6d, 0x33, 0x8b, 0xed, 0xc5, 0xcf, 0xa0, 0x57, 0xc5, 0x21, 0xa3, 0x8a, 0x91, 0xe5, 0xc0, 0x93,
+	0xae, 0xe2, 0x4b, 0x07, 0x88, 0x0b, 0xd8, 0xcf, 0xa9, 0x69, 0x63, 0x77, 0x7a, 0x58, 0x57, 0x91,
+	0xbc, 0xe7, 0xe7, 0xd8, 0x5b, 0xe2, 0xbe, 0x57, 0x91, 0x78, 0x0b, 0xbd, 0x28, 0xab, 0xd1, 0x12,
+	0xd9, 0x54, 0x0a, 0x3f, 0xc7, 0x82, 0x10, 0xef, 0x00, 0x22, 0xc5, 0x8c, 0xd9, 0x2f, 0xa5, 0xaf,
+	0xe5, 0x7d, 0xcf, 0x59, 0xb3, 0x40, 0xc4, 0x08, 0x76, 0x4a, 0x9a, 0x34, 0x5d, 0x54, 0x5b, 0x4b,
+	0x85, 0x3c, 0xf0, 0x6c, 0x6c, 0x07, 0x8d, 0x1c, 0x23, 0x3e, 0xc2, 0xee, 0x0d, 0x65, 0x75, 0x8e,
+	0x33, 0xc9, 0xa1, 0x9f, 0x64, 0xa7, 0xa5, 0x3a, 0xcb, 0x10, 0x56, 0x51, 0xcb, 0x07, 0x7e, 0xe8,
+	0x2a, 0xea, 0x66, 0x4c, 0x5a, 0xaa, 0x75, 0x2a, 0x1f, 0x7a, 0x8e, 0x49, 0x97, 0x1e, 0x3d, 0xfd,
+	0x79, 0x92, 0xd0, 0x3c, 0x1b, 0x10, 0x27, 0xc3, 0xff, 0xb7, 0x44, 0x42, 0xcd, 0xa2, 0x88, 0x36,
+	0xdd, 0x82, 0x38, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0xec, 0xb3, 0x1d, 0x18, 0x8e, 0x06, 0x00,
+	0x00,
 }
diff --git a/go/api/topology.pb.go b/go/api/topology.pb.go
index fd100f6..578bdb7 100644
--- a/go/api/topology.pb.go
+++ b/go/api/topology.pb.go
@@ -46,6 +46,7 @@
 	Topology_POWER_BUTTON                         Topology_Type = 20
 	Topology_VOLUME_BUTTON                        Topology_Type = 21
 	Topology_EC                                   Topology_Type = 22
+	Topology_TOUCH                                Topology_Type = 23
 )
 
 var Topology_Type_name = map[int32]string{
@@ -72,6 +73,7 @@
 	20: "POWER_BUTTON",
 	21: "VOLUME_BUTTON",
 	22: "EC",
+	23: "TOUCH",
 }
 
 var Topology_Type_value = map[string]int32{
@@ -98,6 +100,7 @@
 	"POWER_BUTTON":                         20,
 	"VOLUME_BUTTON":                        21,
 	"EC":                                   22,
+	"TOUCH":                                23,
 }
 
 func (x Topology_Type) String() string {
@@ -2171,173 +2174,173 @@
 }
 
 var fileDescriptor_9bdbf9c393c85c5f = []byte{
-	// 2677 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x99, 0x4b, 0x6f, 0xe3, 0xc8,
-	0xb5, 0xc7, 0x47, 0xd4, 0xc3, 0xd2, 0xd1, 0xc3, 0xd5, 0xd5, 0x8f, 0xe1, 0xe8, 0x62, 0x80, 0x86,
-	0x30, 0x17, 0xb7, 0x31, 0xf7, 0x5e, 0xf9, 0xd1, 0xe3, 0x6e, 0xf7, 0x60, 0x26, 0x09, 0x45, 0x51,
-	0xb6, 0xba, 0x29, 0x51, 0x5d, 0xa2, 0x6c, 0xf7, 0x64, 0x10, 0x82, 0xa2, 0x4a, 0x32, 0xc7, 0x92,
-	0x48, 0x90, 0x54, 0x1b, 0xde, 0x67, 0x17, 0x64, 0x1f, 0x24, 0xcb, 0x7c, 0x87, 0x20, 0x59, 0x24,
-	0x9b, 0xd9, 0x24, 0x8b, 0x2c, 0xb3, 0xca, 0x26, 0x8b, 0x7c, 0x90, 0xa0, 0x8a, 0x94, 0x44, 0xb9,
-	0x3d, 0x68, 0x49, 0xd3, 0x1b, 0x9b, 0x75, 0x58, 0xff, 0x1f, 0xeb, 0x5d, 0xe7, 0x1c, 0xc1, 0x67,
-	0xd6, 0xa5, 0xe7, 0x4c, 0xec, 0xd9, 0xc4, 0xf1, 0xf7, 0x2c, 0x67, 0x3a, 0xb4, 0x47, 0x7b, 0xa6,
-	0x6b, 0xef, 0x05, 0x8e, 0xeb, 0x8c, 0x9d, 0xd1, 0x4d, 0xd5, 0xf5, 0x9c, 0xc0, 0xc1, 0x0f, 0x97,
-	0xb5, 0xaa, 0x61, 0xad, 0xaa, 0xe9, 0xda, 0xe5, 0xff, 0xbe, 0x5b, 0x6c, 0x39, 0x13, 0xd7, 0x99,
-	0xd2, 0x69, 0x10, 0xaa, 0x2b, 0xdf, 0xa7, 0x21, 0xab, 0x47, 0x40, 0x5c, 0x02, 0xc1, 0x1e, 0x88,
-	0x89, 0xc7, 0x89, 0x27, 0x39, 0x22, 0xd8, 0x03, 0x7c, 0x0c, 0xa9, 0xe0, 0xc6, 0xa5, 0xa2, 0xf0,
-	0x38, 0xf1, 0xa4, 0x74, 0xf8, 0x59, 0xf5, 0xce, 0x2f, 0x55, 0xe7, 0xf2, 0xaa, 0x7e, 0xe3, 0x52,
-	0xc2, 0x15, 0x98, 0x40, 0x7e, 0x40, 0x7d, 0xcb, 0xb3, 0xdd, 0xc0, 0x76, 0xa6, 0x62, 0xf2, 0x71,
-	0xf2, 0x49, 0xfe, 0x70, 0xff, 0x7d, 0x80, 0xfa, 0x52, 0xa2, 0x4c, 0x03, 0xef, 0x86, 0xc4, 0x21,
-	0x98, 0x00, 0xba, 0x34, 0xbd, 0xc1, 0xb5, 0xe9, 0x51, 0x63, 0x48, 0xcd, 0x60, 0xe6, 0x51, 0x31,
-	0xf5, 0x38, 0xf1, 0x24, 0x7f, 0xf8, 0x3f, 0x3f, 0x00, 0x3e, 0x8d, 0xaa, 0x37, 0xc2, 0xda, 0x3e,
-	0xd9, 0xbd, 0x5c, 0xb5, 0x94, 0x7f, 0x02, 0xe8, 0xf6, 0x47, 0x31, 0x82, 0xe4, 0x15, 0xbd, 0x89,
-	0x86, 0x81, 0x3d, 0xe2, 0x07, 0x90, 0x7e, 0x6b, 0x8e, 0x67, 0xe1, 0x40, 0xe4, 0x48, 0x58, 0xf8,
-	0x52, 0x38, 0x4e, 0x54, 0x7e, 0x99, 0x84, 0x14, 0xeb, 0x36, 0x46, 0x50, 0xd0, 0xdf, 0x74, 0x14,
-	0xa3, 0xd7, 0x7e, 0xd5, 0xd6, 0xce, 0xdb, 0xe8, 0x23, 0x0c, 0x90, 0xe9, 0xca, 0x44, 0x51, 0xda,
-	0x28, 0x81, 0x77, 0x21, 0xdf, 0xd0, 0x48, 0xcb, 0x68, 0x48, 0xb2, 0xae, 0x11, 0x24, 0xe0, 0x1c,
-	0xa4, 0xa5, 0x5e, 0xbd, 0xa9, 0xa1, 0x24, 0xaf, 0xa7, 0xbf, 0x51, 0x7b, 0x5d, 0x94, 0xc2, 0x05,
-	0xc8, 0xbe, 0x52, 0xde, 0xd4, 0x34, 0x89, 0xd4, 0x51, 0x1a, 0xe7, 0x61, 0x47, 0x3f, 0x55, 0x48,
-	0x4b, 0x52, 0x51, 0x86, 0x55, 0x93, 0xa5, 0x96, 0x42, 0x24, 0xb4, 0x83, 0x9f, 0xc0, 0x67, 0x92,
-	0x2c, 0x2b, 0xaa, 0x42, 0xb4, 0x96, 0xa2, 0x2b, 0xc4, 0x38, 0x79, 0x43, 0xb4, 0xae, 0xac, 0x75,
-	0x14, 0xa3, 0x25, 0x9d, 0xb4, 0x15, 0x3d, 0x34, 0xa3, 0x2c, 0xff, 0x70, 0xb3, 0x7d, 0xa2, 0x90,
-	0x0e, 0x69, 0xb6, 0x75, 0x94, 0xc3, 0x0f, 0x00, 0x75, 0x88, 0x76, 0xd1, 0x6c, 0x35, 0xf5, 0x37,
-	0x46, 0x57, 0x69, 0x77, 0x35, 0x82, 0x00, 0x63, 0x28, 0xd5, 0xa5, 0xde, 0xc9, 0x29, 0x63, 0x85,
-	0x5f, 0xcf, 0x63, 0x11, 0x1e, 0xb4, 0xb5, 0xb6, 0x71, 0xa6, 0xa9, 0x92, 0xde, 0x54, 0x15, 0xa3,
-	0xab, 0x6b, 0x44, 0x3a, 0x51, 0x50, 0x01, 0xef, 0x40, 0x92, 0x48, 0x2d, 0x54, 0xc4, 0x59, 0x48,
-	0x9d, 0x37, 0x1b, 0x4d, 0x54, 0xc2, 0x45, 0xc8, 0xa9, 0xba, 0x12, 0x69, 0x77, 0x59, 0xb1, 0x5b,
-	0x37, 0x88, 0x22, 0xd5, 0x15, 0x82, 0x10, 0xbe, 0x0f, 0xbb, 0x2d, 0x8d, 0x75, 0x85, 0xbf, 0x37,
-	0x7a, 0xdd, 0x1a, 0xba, 0xc7, 0xea, 0xd4, 0xd4, 0x9e, 0xa2, 0x6b, 0x9a, 0x7e, 0x8a, 0x30, 0x2e,
-	0x01, 0xd4, 0x24, 0x42, 0x14, 0xf5, 0xa5, 0x24, 0xbf, 0x42, 0xf7, 0xd9, 0x80, 0x76, 0xb4, 0x73,
-	0xd6, 0x9e, 0x9e, 0xae, 0x6b, 0x6d, 0xf4, 0x00, 0xdf, 0x83, 0xe2, 0x99, 0xa6, 0xf6, 0x5a, 0xca,
-	0xdc, 0xf4, 0x10, 0x67, 0x40, 0x50, 0x64, 0xf4, 0xa8, 0xf2, 0xcf, 0xe7, 0x80, 0x6e, 0x4f, 0x36,
-	0x96, 0x20, 0x3d, 0xf3, 0xfb, 0x86, 0xc5, 0x67, 0x32, 0x7f, 0xf8, 0x7f, 0x6b, 0x2e, 0x92, 0x6a,
-	0xcf, 0xef, 0xcb, 0x24, 0x35, 0xf3, 0xfb, 0xf2, 0x1c, 0x61, 0xf2, 0x89, 0xdf, 0x0c, 0x21, 0x71,
-	0x84, 0x84, 0xbf, 0x86, 0xe4, 0x38, 0xa0, 0x62, 0x92, 0x03, 0xfe, 0x77, 0x5d, 0x80, 0x1a, 0x50,
-	0xc2, 0x74, 0xf8, 0x67, 0x90, 0xba, 0x1c, 0x4c, 0xec, 0x68, 0xa1, 0xaf, 0xdd, 0x80, 0xd3, 0xc1,
-	0xc4, 0x26, 0x5c, 0x89, 0xbf, 0x81, 0xdc, 0xf0, 0xda, 0x08, 0x2b, 0x8b, 0x69, 0x8e, 0xf9, 0x7a,
-	0x5d, 0x4c, 0xc3, 0xf6, 0x26, 0xcc, 0x20, 0xf3, 0x3a, 0x33, 0xcf, 0x64, 0xbb, 0x84, 0x64, 0x87,
-	0xd7, 0xa1, 0x01, 0xcb, 0x90, 0x36, 0x67, 0x03, 0xdb, 0x11, 0x33, 0x9c, 0xfb, 0xff, 0xeb, 0x72,
-	0x25, 0x26, 0x22, 0xa1, 0x16, 0x37, 0x20, 0x63, 0x99, 0x13, 0xea, 0x99, 0xe2, 0x0e, 0xa7, 0x54,
-	0xd7, 0xa5, 0xc8, 0x5c, 0x45, 0x22, 0x35, 0xfe, 0x39, 0x14, 0x4d, 0xcb, 0xa2, 0x63, 0xea, 0x39,
-	0x13, 0x1a, 0x50, 0x4f, 0xcc, 0x72, 0xdc, 0xd1, 0xda, 0x8d, 0x8a, 0x8b, 0xc9, 0x2a, 0x0b, 0x6b,
-	0x90, 0x1b, 0xdd, 0x78, 0x8e, 0x6f, 0x39, 0x2e, 0x15, 0x73, 0x1c, 0x7c, 0xb0, 0x2e, 0xf8, 0x64,
-	0x2e, 0x24, 0x4b, 0x06, 0xbe, 0x80, 0xc2, 0xc4, 0x1c, 0x4d, 0x69, 0x10, 0x35, 0x16, 0x38, 0xf3,
-	0x8b, 0x75, 0x99, 0xad, 0x98, 0x96, 0xac, 0x90, 0xf0, 0x19, 0x14, 0xc6, 0xf6, 0xe8, 0x32, 0x30,
-	0x7c, 0x3a, 0xf5, 0x1d, 0x4f, 0xcc, 0x73, 0xf2, 0xd3, 0xb5, 0x97, 0x1e, 0xd3, 0x76, 0xb9, 0x94,
-	0xe4, 0xc7, 0xcb, 0x02, 0x9b, 0x27, 0xdf, 0xf2, 0x28, 0x9d, 0x8a, 0x85, 0xcd, 0xe6, 0xa9, 0xcb,
-	0x55, 0x24, 0x52, 0xe3, 0x2e, 0xe4, 0x87, 0x8e, 0x37, 0x31, 0x86, 0xa6, 0x15, 0x38, 0x9e, 0x58,
-	0xe4, 0xb0, 0xc3, 0xb5, 0x97, 0xa4, 0xe3, 0x4d, 0x1a, 0x5c, 0x49, 0x60, 0xb8, 0x78, 0xe6, 0x8d,
-	0x0b, 0x6e, 0xc6, 0x33, 0x5f, 0x2c, 0x6d, 0xd8, 0x38, 0xae, 0x22, 0x91, 0x1a, 0xab, 0x90, 0xbd,
-	0xa2, 0x37, 0x7d, 0xc7, 0xf4, 0x06, 0xe2, 0x2e, 0x27, 0xed, 0xaf, 0x4b, 0x7a, 0x15, 0xe9, 0xc8,
-	0x82, 0xc0, 0x5a, 0x35, 0xa1, 0x13, 0xc7, 0xbb, 0x11, 0xd1, 0x66, 0xad, 0x6a, 0x71, 0x15, 0x89,
-	0xd4, 0xb8, 0x07, 0xf9, 0xa1, 0x3d, 0x1d, 0x51, 0xcf, 0xf5, 0xec, 0x69, 0x20, 0xde, 0xdb, 0x6c,
-	0x46, 0x1b, 0x4b, 0x29, 0x89, 0x73, 0x70, 0x13, 0x76, 0xfc, 0xc0, 0xf1, 0xcc, 0x11, 0x15, 0x31,
-	0x47, 0xee, 0xad, 0x3f, 0x6a, 0x5c, 0x46, 0xe6, 0x7a, 0xb6, 0x3f, 0xfa, 0xe3, 0x19, 0x0d, 0x1c,
-	0x27, 0xb8, 0x14, 0xef, 0x6f, 0xb6, 0x3f, 0x6a, 0x73, 0x21, 0x59, 0x32, 0x30, 0x01, 0xe8, 0x9b,
-	0x9e, 0x47, 0xc7, 0xdf, 0x99, 0xd6, 0x95, 0xf8, 0x60, 0xb3, 0x45, 0x52, 0xe3, 0xca, 0x97, 0xa6,
-	0x75, 0x45, 0x62, 0x14, 0x76, 0x98, 0x5e, 0xdb, 0x43, 0x5b, 0xfc, 0x78, 0xb3, 0xc3, 0xf4, 0xdc,
-	0x1e, 0xda, 0x84, 0x2b, 0xf1, 0x6b, 0x28, 0xb8, 0xce, 0x35, 0xf5, 0x8c, 0xfe, 0x2c, 0x08, 0x9c,
-	0xa9, 0xf8, 0x70, 0xb3, 0x69, 0xad, 0x71, 0x15, 0xc9, 0x73, 0x46, 0x58, 0xc0, 0x5d, 0x28, 0xbe,
-	0x75, 0xc6, 0xb3, 0x09, 0x9d, 0x33, 0x1f, 0x6d, 0xc5, 0x2c, 0x84, 0x90, 0x08, 0x7a, 0x05, 0xf7,
-	0xe9, 0xa4, 0x4f, 0x07, 0x03, 0x3a, 0x60, 0x47, 0x7f, 0xe0, 0x39, 0xe3, 0x31, 0xf5, 0x44, 0x91,
-	0xa3, 0xbf, 0x5c, 0x17, 0xad, 0x44, 0x08, 0x79, 0x41, 0x20, 0x98, 0xbe, 0x63, 0x2b, 0x7f, 0x0a,
-	0x69, 0xd9, 0x99, 0x4d, 0x83, 0xa5, 0x9f, 0xc4, 0x6e, 0xdc, 0x62, 0xe4, 0x27, 0x95, 0x5f, 0x41,
-	0x8a, 0x5d, 0xa9, 0xec, 0xb2, 0xb0, 0x58, 0xb5, 0xe8, 0x3e, 0x5e, 0xfb, 0xb2, 0xe0, 0x6c, 0x12,
-	0x6a, 0x23, 0x98, 0xf4, 0x61, 0x60, 0x1d, 0x48, 0xaa, 0x01, 0x65, 0xdb, 0xc0, 0xf5, 0xa8, 0x4f,
-	0x23, 0x5a, 0x69, 0xfd, 0x6d, 0xd0, 0x09, 0x65, 0x64, 0xae, 0x2f, 0xbf, 0x86, 0x14, 0xbb, 0x7a,
-	0x3f, 0x24, 0x52, 0x82, 0x87, 0x77, 0x5e, 0xc3, 0x77, 0x8f, 0x36, 0xc6, 0x90, 0x9a, 0x98, 0xfe,
-	0x15, 0xf7, 0x58, 0x8a, 0x84, 0x3f, 0x97, 0xff, 0x92, 0x84, 0x34, 0xbf, 0x72, 0xf1, 0x1b, 0xc8,
-	0xf3, 0x4b, 0xd7, 0xb0, 0x9c, 0x01, 0xb5, 0xa2, 0xb6, 0x1d, 0x6f, 0x74, 0x6d, 0x87, 0x7f, 0x65,
-	0xa6, 0x27, 0x60, 0x2e, 0x9e, 0x19, 0xda, 0x77, 0xa9, 0x79, 0x45, 0x3d, 0xc3, 0x9c, 0xb8, 0x51,
-	0xcc, 0xf0, 0x23, 0xd0, 0x11, 0x4c, 0x9a, 0xb8, 0xd8, 0x84, 0xdd, 0x4b, 0x6a, 0x0e, 0xdc, 0x4b,
-	0x67, 0x4a, 0xa3, 0x96, 0x27, 0x7f, 0x24, 0xbe, 0xb4, 0x00, 0xf2, 0x72, 0xe5, 0x77, 0x09, 0x80,
-	0xe5, 0x6b, 0xfc, 0x31, 0xdc, 0xe7, 0xfe, 0xb9, 0x21, 0x6b, 0x75, 0x45, 0x5e, 0xf5, 0xea, 0x89,
-	0x7e, 0xf4, 0xec, 0xf8, 0x10, 0x25, 0x98, 0xb7, 0x2e, 0xa9, 0x32, 0x2b, 0x34, 0x91, 0xc0, 0xbc,
-	0xf5, 0xa8, 0x84, 0x92, 0xec, 0x55, 0x4b, 0xba, 0x78, 0x71, 0xfc, 0xf4, 0xe8, 0x79, 0xe8, 0xd6,
-	0x87, 0xa5, 0xe7, 0x4f, 0x51, 0x7a, 0x59, 0x7a, 0xb6, 0x1f, 0xfa, 0xf5, 0x44, 0x3f, 0xd8, 0x3f,
-	0x38, 0x42, 0x3b, 0xec, 0xb9, 0x2e, 0x3d, 0x3f, 0x3c, 0x78, 0x81, 0xb2, 0x11, 0xee, 0x60, 0xff,
-	0xe0, 0x00, 0xe5, 0xca, 0x7f, 0xce, 0x40, 0x26, 0xf4, 0x76, 0xb0, 0x06, 0x3b, 0x03, 0xfa, 0xd6,
-	0xb6, 0xa8, 0x2f, 0xa6, 0x78, 0x54, 0x75, 0xb4, 0x99, 0xbb, 0x54, 0xad, 0x73, 0x35, 0x99, 0x53,
-	0xca, 0xbf, 0x4e, 0x42, 0x26, 0xb4, 0xe1, 0x33, 0xc8, 0xd9, 0xd3, 0x80, 0x7a, 0x43, 0xd3, 0xa2,
-	0x9b, 0x4e, 0x60, 0x44, 0x6f, 0xce, 0xf5, 0x64, 0x89, 0xc2, 0x2d, 0xc8, 0x0c, 0x4d, 0xcb, 0x9e,
-	0x8e, 0xa2, 0x69, 0xdb, 0xb4, 0xc9, 0x0d, 0x2e, 0x26, 0x11, 0x04, 0x7f, 0x0b, 0x79, 0xc7, 0xb3,
-	0xe9, 0x34, 0xe0, 0xfb, 0x80, 0xbb, 0xc6, 0xa5, 0xf5, 0x0f, 0xb5, 0x88, 0xa9, 0x2d, 0x09, 0x24,
-	0x8e, 0x63, 0xdb, 0x6a, 0x38, 0x36, 0x47, 0x3e, 0xf7, 0x95, 0x8b, 0x24, 0x2c, 0xb0, 0xa0, 0xd0,
-	0x1e, 0xf8, 0x62, 0xe6, 0x71, 0x92, 0x05, 0x85, 0xf6, 0xc0, 0xc7, 0x67, 0x50, 0x72, 0x3d, 0xfb,
-	0xad, 0x69, 0xdd, 0x18, 0xfe, 0xb5, 0x1d, 0x58, 0x97, 0xdc, 0x7d, 0xdd, 0x62, 0xa7, 0x17, 0x23,
-	0x4c, 0x97, 0x53, 0x2a, 0x4d, 0xc8, 0x2d, 0x06, 0x11, 0x3f, 0x84, 0x7b, 0xcd, 0xb6, 0xae, 0x90,
-	0x86, 0x24, 0xc7, 0x63, 0xcb, 0x7b, 0x50, 0x8c, 0x99, 0xbb, 0x35, 0x94, 0x60, 0x21, 0xdc, 0xd2,
-	0xd4, 0x6a, 0x76, 0x9a, 0x48, 0xa8, 0xfc, 0x14, 0x32, 0xe1, 0xd0, 0xb1, 0xb7, 0x0d, 0x49, 0x6e,
-	0xb6, 0x4f, 0x62, 0x10, 0x04, 0x85, 0xc8, 0xd6, 0x20, 0x5a, 0x5b, 0x8f, 0xc2, 0xd4, 0xd0, 0x52,
-	0x63, 0x41, 0x98, 0x50, 0xb9, 0x86, 0x7c, 0x6c, 0x9c, 0xd8, 0xae, 0xd0, 0x48, 0x53, 0x69, 0xeb,
-	0x92, 0xde, 0xd4, 0xda, 0xab, 0xed, 0x89, 0xbf, 0xd8, 0x0f, 0xdb, 0x13, 0x37, 0xbd, 0xd8, 0x47,
-	0x02, 0x8b, 0x03, 0xe3, 0xb6, 0x83, 0xe3, 0x7d, 0x94, 0xbc, 0x6d, 0x3c, 0x7c, 0xbe, 0x8f, 0x52,
-	0x95, 0x16, 0xa4, 0x1b, 0x7c, 0xdc, 0x4b, 0x00, 0x0d, 0x55, 0x3a, 0xe9, 0x1a, 0x6d, 0xad, 0xad,
-	0xa0, 0x8f, 0x58, 0x13, 0xc2, 0x72, 0xb7, 0xd7, 0xe9, 0x68, 0x44, 0x37, 0x0e, 0xf6, 0x8f, 0xf7,
-	0x3b, 0x28, 0x81, 0xff, 0x0b, 0x3e, 0x5e, 0x7d, 0x21, 0xf5, 0x74, 0xad, 0xa1, 0xc9, 0xbd, 0x2e,
-	0x12, 0xca, 0x7f, 0x4f, 0x40, 0x71, 0xc5, 0xbd, 0xc7, 0xdf, 0xc2, 0xbd, 0xb1, 0x3d, 0x30, 0x56,
-	0x03, 0x86, 0x2d, 0x8f, 0x6a, 0x34, 0xb6, 0x07, 0xab, 0xf4, 0x5f, 0x00, 0xee, 0x9b, 0x3e, 0xbd,
-	0x85, 0x17, 0xb6, 0xc3, 0xdf, 0x63, 0xa8, 0x15, 0x7e, 0xf9, 0x4f, 0x09, 0xc8, 0x2d, 0xa2, 0x0a,
-	0xac, 0x43, 0x91, 0xf5, 0x65, 0x19, 0x9f, 0x6c, 0xd9, 0x8f, 0xc2, 0xd8, 0x1e, 0x2c, 0xa9, 0x67,
-	0x50, 0xe2, 0x7d, 0x58, 0x62, 0xb7, 0x6c, 0x7f, 0x91, 0x61, 0x16, 0xdc, 0xf2, 0x5f, 0x13, 0x50,
-	0x88, 0x47, 0x2f, 0xf8, 0x1b, 0x60, 0x03, 0x68, 0xac, 0x44, 0x43, 0x5b, 0xf6, 0x60, 0x77, 0x6c,
-	0x0f, 0x56, 0xd8, 0xdf, 0x02, 0x1f, 0xbd, 0x55, 0xf8, 0x96, 0xfd, 0x40, 0x8c, 0x14, 0xa7, 0x97,
-	0xbf, 0x4f, 0x40, 0x3e, 0x16, 0x2e, 0xe1, 0x0b, 0x60, 0x0d, 0x30, 0x78, 0xd0, 0x14, 0x05, 0x5f,
-	0x5b, 0x76, 0xa4, 0x34, 0xb6, 0x07, 0xea, 0x12, 0xc3, 0xc6, 0x88, 0xf7, 0x23, 0x8e, 0xde, 0xb2,
-	0x1b, 0xbb, 0x0c, 0x14, 0x63, 0x97, 0xff, 0x96, 0x80, 0x4c, 0x18, 0xa2, 0x61, 0x0b, 0x90, 0x6b,
-	0x4e, 0xe9, 0xd8, 0x70, 0x3d, 0xc7, 0xa5, 0x5e, 0x60, 0x53, 0x3f, 0xca, 0x5c, 0xfc, 0xd0, 0x3d,
-	0x20, 0x2f, 0xf2, 0x89, 0x75, 0xdb, 0x77, 0xc7, 0xe6, 0x4d, 0x87, 0xe9, 0xab, 0x9d, 0x85, 0x9e,
-	0xec, 0x72, 0xe2, 0xd2, 0xc0, 0x96, 0x6b, 0xe0, 0xcc, 0xac, 0x4b, 0xc3, 0x9f, 0xb9, 0xae, 0xe3,
-	0x05, 0xdb, 0x76, 0xa4, 0xc0, 0x29, 0xdd, 0x10, 0xf2, 0x32, 0x95, 0x4d, 0x20, 0xa1, 0xfc, 0x2b,
-	0x01, 0x60, 0x19, 0x21, 0xe2, 0xfe, 0x6a, 0xa8, 0x19, 0x4e, 0x86, 0xb4, 0x79, 0xa8, 0x19, 0x7b,
-	0xe4, 0x49, 0xce, 0x58, 0xe4, 0x59, 0xf9, 0x4d, 0x02, 0x4a, 0xab, 0xaf, 0xf9, 0x21, 0xb5, 0x4c,
-	0xf7, 0xc5, 0xce, 0xc9, 0x22, 0xe4, 0x64, 0x55, 0x6a, 0x75, 0x4f, 0x15, 0x55, 0x0d, 0xcf, 0x5b,
-	0x59, 0x6b, 0x9f, 0x29, 0x44, 0x6f, 0xd6, 0x54, 0x05, 0x09, 0xec, 0xb4, 0xab, 0x2b, 0xba, 0x24,
-	0x9f, 0x4a, 0xac, 0x9c, 0x64, 0x65, 0xf9, 0x94, 0x68, 0x2d, 0xa5, 0x26, 0x75, 0x15, 0x94, 0xe2,
-	0xfa, 0xb0, 0xac, 0x5d, 0xa0, 0x74, 0xac, 0xd8, 0xd4, 0x51, 0x86, 0xe3, 0x78, 0xb1, 0xab, 0x4a,
-	0xba, 0x82, 0x76, 0xca, 0xbf, 0x67, 0x33, 0x1b, 0xc6, 0xb5, 0xaf, 0x17, 0xf1, 0x71, 0x38, 0x08,
-	0x2f, 0x36, 0x8b, 0x8f, 0xa3, 0x7f, 0xbc, 0xf3, 0x11, 0xa8, 0xd2, 0x00, 0x58, 0x5a, 0xd9, 0x79,
-	0x1f, 0xa6, 0x31, 0x63, 0xdd, 0xcd, 0x42, 0x8a, 0x1f, 0xdb, 0xdc, 0x55, 0xe2, 0xb7, 0x53, 0x5b,
-	0x52, 0x91, 0xc0, 0x4a, 0xca, 0x45, 0x54, 0x4a, 0x96, 0xff, 0x2d, 0x40, 0x76, 0x1e, 0x3b, 0xe3,
-	0x3e, 0x14, 0xe7, 0xd1, 0xb3, 0xc1, 0x73, 0xcf, 0x61, 0x73, 0xbf, 0xde, 0x34, 0x08, 0x5f, 0x3c,
-	0xf0, 0x26, 0x17, 0xae, 0x62, 0x25, 0xdc, 0x82, 0x5c, 0xdf, 0xb4, 0xae, 0xf8, 0x5e, 0xda, 0x76,
-	0xf1, 0x2d, 0x09, 0x98, 0xdc, 0x8a, 0x09, 0x93, 0xdb, 0x11, 0xe3, 0x41, 0x61, 0xe5, 0x35, 0x14,
-	0xe2, 0x1d, 0xc0, 0x9f, 0xc0, 0xc3, 0x79, 0x62, 0xd8, 0xb8, 0x95, 0x67, 0x8e, 0x0f, 0x6d, 0x62,
-	0x31, 0xe4, 0xef, 0xac, 0xa5, 0x72, 0x17, 0x32, 0x61, 0x56, 0x21, 0x0c, 0x4e, 0x9c, 0xa1, 0x3d,
-	0xa6, 0x51, 0xf4, 0xb4, 0xf7, 0xde, 0xcd, 0x1d, 0x2a, 0xd9, 0xb6, 0x66, 0x32, 0x32, 0xd7, 0x97,
-	0xff, 0x21, 0x40, 0x3e, 0x96, 0x5e, 0xc0, 0x17, 0x90, 0x1d, 0x3b, 0x56, 0xe8, 0x97, 0x85, 0x33,
-	0xf7, 0xd5, 0x16, 0x59, 0x8a, 0xaa, 0x1a, 0x31, 0xc8, 0x82, 0xc6, 0xdc, 0xb2, 0x30, 0x2b, 0x13,
-	0xe5, 0xe0, 0xc3, 0xe5, 0xf2, 0x29, 0x80, 0xe7, 0x18, 0x6f, 0xa9, 0xe7, 0xdb, 0xd1, 0xc8, 0xe7,
-	0x48, 0xce, 0x73, 0xce, 0x42, 0x43, 0xe5, 0x0f, 0x09, 0xc8, 0xaa, 0x4b, 0x02, 0x52, 0x35, 0xf9,
-	0xb6, 0xeb, 0xf2, 0x09, 0x3c, 0x8c, 0xe7, 0x99, 0x0d, 0x5d, 0xeb, 0x18, 0xaa, 0xd2, 0x60, 0xee,
-	0x90, 0x08, 0x0f, 0x16, 0x83, 0x5e, 0xd3, 0x74, 0x5d, 0x6b, 0x85, 0x6f, 0x84, 0x95, 0xe9, 0x88,
-	0xde, 0x90, 0xe6, 0xc9, 0xa9, 0x8e, 0x92, 0xf8, 0x11, 0xe0, 0xe5, 0x4c, 0x69, 0x9d, 0xc8, 0x9e,
-	0x62, 0x9b, 0xb3, 0xad, 0xe9, 0x46, 0x87, 0x28, 0x5d, 0xa5, 0xad, 0xa3, 0x34, 0x73, 0x58, 0x56,
-	0x3e, 0xdc, 0x6d, 0xd6, 0x95, 0xa8, 0x76, 0xa6, 0xdc, 0x87, 0x9d, 0x28, 0xc5, 0x82, 0xcf, 0xa1,
-	0x10, 0x25, 0x59, 0xe2, 0x1b, 0xe2, 0x8b, 0xf7, 0x4e, 0x59, 0xa4, 0x9f, 0xff, 0xe7, 0xfb, 0x20,
-	0xef, 0x2f, 0x0b, 0xe5, 0x1e, 0xe4, 0x16, 0x99, 0x17, 0x7c, 0x0a, 0xb9, 0xc5, 0x4f, 0x43, 0xd1,
-	0xaa, 0xf8, 0xfc, 0xbd, 0x9f, 0x88, 0x25, 0x6e, 0x16, 0xe2, 0xf2, 0x39, 0xc0, 0x32, 0xfd, 0xf2,
-	0x21, 0x03, 0xe1, 0xdf, 0x0a, 0x90, 0x3a, 0xb7, 0x87, 0x36, 0x1e, 0x83, 0x18, 0x5d, 0x1d, 0x74,
-	0x60, 0x5c, 0x8f, 0xcd, 0xa9, 0xc1, 0x7f, 0xcb, 0xb2, 0x9c, 0x31, 0x3b, 0xdd, 0x92, 0x4f, 0x4a,
-	0x3f, 0x98, 0x28, 0x5a, 0x36, 0x9d, 0x81, 0xaa, 0xe7, 0xaa, 0xd4, 0xee, 0x44, 0x52, 0xf2, 0x68,
-	0xc1, 0x3c, 0x1f, 0x9b, 0xd3, 0xb9, 0x99, 0x5d, 0x57, 0x70, 0x6d, 0x0f, 0x6d, 0xc3, 0xba, 0xb4,
-	0x5d, 0x5f, 0x14, 0x38, 0xff, 0x68, 0x93, 0xd4, 0x11, 0xff, 0x23, 0x5f, 0xda, 0x2e, 0xc9, 0x5d,
-	0x47, 0x4f, 0x7e, 0xa5, 0x0d, 0xd9, 0xb9, 0x99, 0x39, 0xf9, 0xe7, 0xcd, 0x46, 0xd3, 0x90, 0x4f,
-	0x9b, 0x9d, 0xd8, 0xca, 0xe4, 0x66, 0xa2, 0xa8, 0x4a, 0xb7, 0x6b, 0x1c, 0x3f, 0x53, 0xea, 0xc7,
-	0xfb, 0x07, 0x75, 0x94, 0x60, 0xcb, 0x78, 0x61, 0x26, 0x8a, 0xa4, 0xea, 0xca, 0x2b, 0x24, 0x94,
-	0xff, 0x28, 0x40, 0x26, 0xca, 0xfd, 0xb4, 0x20, 0xe3, 0xd1, 0xd1, 0x72, 0x07, 0x1e, 0x6d, 0x96,
-	0x49, 0xaa, 0x12, 0x2e, 0x26, 0x11, 0x04, 0x9f, 0x40, 0x8a, 0x0e, 0x46, 0x73, 0xef, 0xef, 0xe9,
-	0x86, 0x30, 0x65, 0x30, 0xa2, 0x84, 0x03, 0x70, 0x19, 0xb2, 0xae, 0xe3, 0xdb, 0xc1, 0x7c, 0xa7,
-	0x0a, 0x64, 0x51, 0xae, 0x3c, 0x83, 0x4c, 0xf8, 0x59, 0x76, 0x8f, 0x10, 0xe5, 0x64, 0x75, 0x8f,
-	0xc6, 0x7f, 0x4a, 0x8b, 0xff, 0x44, 0x26, 0x54, 0x6a, 0x90, 0x62, 0x5f, 0x60, 0xb1, 0x8c, 0x52,
-	0x3f, 0x51, 0x56, 0xef, 0x9e, 0x68, 0x1b, 0xe7, 0x20, 0x1d, 0x6e, 0x2b, 0x01, 0xef, 0x40, 0x52,
-	0xd7, 0x3a, 0xe1, 0x8f, 0x6e, 0xe1, 0xbe, 0x45, 0xa9, 0xf2, 0xbf, 0x04, 0xc0, 0xef, 0x66, 0xba,
-	0x3e, 0xe0, 0xca, 0xc5, 0xdf, 0xc1, 0x0e, 0xb5, 0x8c, 0xd8, 0x4f, 0xa9, 0xaf, 0xb7, 0xcf, 0xc0,
-	0xdd, 0x61, 0x0a, 0x6f, 0x65, 0x6a, 0xf1, 0x9b, 0xe2, 0x04, 0x52, 0xae, 0xe9, 0x05, 0x91, 0xdb,
-	0xf6, 0xf4, 0xbd, 0x1b, 0xe1, 0x8e, 0x1c, 0x1f, 0x07, 0x54, 0x5e, 0xc2, 0xa3, 0xbb, 0x3f, 0xc5,
-	0x22, 0x36, 0x45, 0xbe, 0x7d, 0x0d, 0x15, 0x21, 0xa7, 0xc8, 0x46, 0xe8, 0x7f, 0x84, 0xd3, 0xa4,
-	0xc8, 0xc6, 0x79, 0x53, 0x95, 0x35, 0x24, 0x54, 0xbe, 0x82, 0x9d, 0x68, 0x50, 0x98, 0x38, 0x3a,
-	0x03, 0x63, 0xe2, 0x3c, 0xec, 0xcc, 0x0f, 0xc6, 0xc4, 0xed, 0x93, 0x52, 0xa8, 0x7d, 0xfe, 0xcd,
-	0x93, 0x91, 0xb3, 0xe8, 0x48, 0xd5, 0xf1, 0x46, 0x7b, 0xef, 0xfe, 0xb8, 0x3d, 0x72, 0xf6, 0x4c,
-	0xd7, 0xee, 0x67, 0xf8, 0x51, 0xf0, 0xf4, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x12, 0xb6, 0x25,
-	0x73, 0x3c, 0x1f, 0x00, 0x00,
+	// 2684 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x99, 0xcd, 0x6f, 0xdb, 0xc8,
+	0xf9, 0xc7, 0x57, 0xd4, 0x8b, 0xa5, 0x47, 0x2f, 0x9e, 0x4c, 0xde, 0xb8, 0xfa, 0x61, 0x81, 0x40,
+	0xd8, 0x1f, 0x1a, 0x6c, 0x5b, 0xc5, 0x76, 0xd6, 0x89, 0xb3, 0xd8, 0x6d, 0x4b, 0x51, 0x94, 0xad,
+	0x84, 0x12, 0x95, 0x11, 0x65, 0x3b, 0xdb, 0x45, 0x09, 0x8a, 0x1a, 0xc9, 0x5c, 0x4b, 0x22, 0x41,
+	0x52, 0x31, 0xfc, 0x37, 0x14, 0x45, 0xaf, 0x45, 0x7b, 0xec, 0xff, 0x50, 0xb4, 0x87, 0xf6, 0xd2,
+	0x4b, 0x7b, 0x68, 0x6f, 0x3d, 0xf5, 0xd2, 0x43, 0xff, 0x90, 0x62, 0x86, 0x94, 0x44, 0x39, 0x5e,
+	0x44, 0xd2, 0xe6, 0x62, 0x73, 0x1e, 0xce, 0xf7, 0xc3, 0x79, 0x9f, 0xe7, 0x79, 0x04, 0x9f, 0x5a,
+	0x17, 0x9e, 0x33, 0xb1, 0x67, 0x13, 0xc7, 0x7f, 0x62, 0x39, 0xd3, 0xa1, 0x3d, 0x7a, 0x62, 0xba,
+	0xf6, 0x93, 0xc0, 0x71, 0x9d, 0xb1, 0x33, 0xba, 0xae, 0xba, 0x9e, 0x13, 0x38, 0xf8, 0xfe, 0xb2,
+	0x56, 0x35, 0xac, 0x55, 0x35, 0x5d, 0xbb, 0xfc, 0xff, 0xb7, 0x8b, 0x2d, 0x67, 0xe2, 0x3a, 0x53,
+	0x3a, 0x0d, 0x42, 0x75, 0xe5, 0x9f, 0x69, 0xc8, 0xea, 0x11, 0x10, 0x97, 0x40, 0xb0, 0x07, 0x62,
+	0xe2, 0x51, 0xe2, 0x71, 0x8e, 0x08, 0xf6, 0x00, 0x1f, 0x41, 0x2a, 0xb8, 0x76, 0xa9, 0x28, 0x3c,
+	0x4a, 0x3c, 0x2e, 0x1d, 0x7c, 0x5a, 0xbd, 0xf5, 0x4b, 0xd5, 0xb9, 0xbc, 0xaa, 0x5f, 0xbb, 0x94,
+	0x70, 0x05, 0x26, 0x90, 0x1f, 0x50, 0xdf, 0xf2, 0x6c, 0x37, 0xb0, 0x9d, 0xa9, 0x98, 0x7c, 0x94,
+	0x7c, 0x9c, 0x3f, 0xd8, 0x7b, 0x1f, 0xa0, 0xbe, 0x94, 0x28, 0xd3, 0xc0, 0xbb, 0x26, 0x71, 0x08,
+	0x26, 0x80, 0x2e, 0x4c, 0x6f, 0x70, 0x65, 0x7a, 0xd4, 0x18, 0x52, 0x33, 0x98, 0x79, 0x54, 0x4c,
+	0x3d, 0x4a, 0x3c, 0xce, 0x1f, 0xfc, 0xe0, 0x3b, 0xc0, 0x27, 0x51, 0xf5, 0x46, 0x58, 0xdb, 0x27,
+	0xbb, 0x17, 0xab, 0x96, 0xf2, 0x4f, 0x00, 0xdd, 0xfc, 0x28, 0x46, 0x90, 0xbc, 0xa4, 0xd7, 0xd1,
+	0x30, 0xb0, 0x47, 0x7c, 0x0f, 0xd2, 0x6f, 0xcd, 0xf1, 0x2c, 0x1c, 0x88, 0x1c, 0x09, 0x0b, 0x5f,
+	0x08, 0x47, 0x89, 0xca, 0xaf, 0x93, 0x90, 0x62, 0xdd, 0xc6, 0x08, 0x0a, 0xfa, 0x9b, 0x8e, 0x62,
+	0xf4, 0xda, 0xaf, 0xda, 0xda, 0x59, 0x1b, 0x7d, 0x84, 0x01, 0x32, 0x5d, 0x99, 0x28, 0x4a, 0x1b,
+	0x25, 0xf0, 0x2e, 0xe4, 0x1b, 0x1a, 0x69, 0x19, 0x0d, 0x49, 0xd6, 0x35, 0x82, 0x04, 0x9c, 0x83,
+	0xb4, 0xd4, 0xab, 0x37, 0x35, 0x94, 0xe4, 0xf5, 0xf4, 0x37, 0x6a, 0xaf, 0x8b, 0x52, 0xb8, 0x00,
+	0xd9, 0x57, 0xca, 0x9b, 0x9a, 0x26, 0x91, 0x3a, 0x4a, 0xe3, 0x3c, 0xec, 0xe8, 0x27, 0x0a, 0x69,
+	0x49, 0x2a, 0xca, 0xb0, 0x6a, 0xb2, 0xd4, 0x52, 0x88, 0x84, 0x76, 0xf0, 0x63, 0xf8, 0x54, 0x92,
+	0x65, 0x45, 0x55, 0x88, 0xd6, 0x52, 0x74, 0x85, 0x18, 0xc7, 0x6f, 0x88, 0xd6, 0x95, 0xb5, 0x8e,
+	0x62, 0xb4, 0xa4, 0xe3, 0xb6, 0xa2, 0x87, 0x66, 0x94, 0xe5, 0x1f, 0x6e, 0xb6, 0x8f, 0x15, 0xd2,
+	0x21, 0xcd, 0xb6, 0x8e, 0x72, 0xf8, 0x1e, 0xa0, 0x0e, 0xd1, 0xce, 0x9b, 0xad, 0xa6, 0xfe, 0xc6,
+	0xe8, 0x2a, 0xed, 0xae, 0x46, 0x10, 0x60, 0x0c, 0xa5, 0xba, 0xd4, 0x3b, 0x3e, 0x61, 0xac, 0xf0,
+	0xeb, 0x79, 0x2c, 0xc2, 0xbd, 0xb6, 0xd6, 0x36, 0x4e, 0x35, 0x55, 0xd2, 0x9b, 0xaa, 0x62, 0x74,
+	0x75, 0x8d, 0x48, 0xc7, 0x0a, 0x2a, 0xe0, 0x1d, 0x48, 0x12, 0xa9, 0x85, 0x8a, 0x38, 0x0b, 0xa9,
+	0xb3, 0x66, 0xa3, 0x89, 0x4a, 0xb8, 0x08, 0x39, 0x55, 0x57, 0x22, 0xed, 0x2e, 0x2b, 0x76, 0xeb,
+	0x06, 0x51, 0xa4, 0xba, 0x42, 0x10, 0xc2, 0x77, 0x61, 0xb7, 0xa5, 0xb1, 0xae, 0xf0, 0xf7, 0x46,
+	0xaf, 0x5b, 0x43, 0x77, 0x58, 0x9d, 0x9a, 0xda, 0x53, 0x74, 0x4d, 0xd3, 0x4f, 0x10, 0xc6, 0x25,
+	0x80, 0x9a, 0x44, 0x88, 0xa2, 0xbe, 0x94, 0xe4, 0x57, 0xe8, 0x2e, 0x1b, 0xd0, 0x8e, 0x76, 0xc6,
+	0xda, 0xd3, 0xd3, 0x75, 0xad, 0x8d, 0xee, 0xe1, 0x3b, 0x50, 0x3c, 0xd5, 0xd4, 0x5e, 0x4b, 0x99,
+	0x9b, 0xee, 0xe3, 0x0c, 0x08, 0x8a, 0x8c, 0x1e, 0xb0, 0xe1, 0xd4, 0xb5, 0x9e, 0x7c, 0x82, 0x1e,
+	0x56, 0xfe, 0xfd, 0x1c, 0xd0, 0xcd, 0x79, 0xc7, 0x12, 0xa4, 0x67, 0x7e, 0xdf, 0xb0, 0xf8, 0xa4,
+	0xe6, 0x0f, 0x7e, 0xb4, 0xe6, 0x7a, 0xa9, 0xf6, 0xfc, 0xbe, 0x4c, 0x52, 0x33, 0xbf, 0x2f, 0xcf,
+	0x11, 0x26, 0x5f, 0x03, 0x9b, 0x21, 0x24, 0x8e, 0x90, 0xf0, 0x57, 0x90, 0x1c, 0x07, 0x54, 0x4c,
+	0x72, 0xc0, 0x0f, 0xd7, 0x05, 0xa8, 0x01, 0x25, 0x4c, 0x87, 0x7f, 0x06, 0xa9, 0x8b, 0xc1, 0xc4,
+	0x8e, 0xd6, 0xfc, 0xda, 0x0d, 0x38, 0x19, 0x4c, 0x6c, 0xc2, 0x95, 0xf8, 0x6b, 0xc8, 0x0d, 0xaf,
+	0x8c, 0xb0, 0xb2, 0x98, 0xe6, 0x98, 0xaf, 0xd6, 0xc5, 0x34, 0x6c, 0x6f, 0xc2, 0x0c, 0x32, 0xaf,
+	0x33, 0xf3, 0x4c, 0xb6, 0x61, 0x48, 0x76, 0x78, 0x15, 0x1a, 0xb0, 0x0c, 0x69, 0x73, 0x36, 0xb0,
+	0x1d, 0x31, 0xc3, 0xb9, 0x3f, 0x5e, 0x97, 0x2b, 0x31, 0x11, 0x09, 0xb5, 0xb8, 0x01, 0x19, 0xcb,
+	0x9c, 0x50, 0xcf, 0x14, 0x77, 0x38, 0xa5, 0xba, 0x2e, 0x45, 0xe6, 0x2a, 0x12, 0xa9, 0xf1, 0xcf,
+	0xa1, 0x68, 0x5a, 0x16, 0x1d, 0x53, 0xcf, 0x99, 0xd0, 0x80, 0x7a, 0x62, 0x96, 0xe3, 0x0e, 0xd7,
+	0x6e, 0x54, 0x5c, 0x4c, 0x56, 0x59, 0x58, 0x83, 0xdc, 0xe8, 0xda, 0x73, 0x7c, 0xcb, 0x71, 0xa9,
+	0x98, 0xe3, 0xe0, 0xfd, 0x75, 0xc1, 0xc7, 0x73, 0x21, 0x59, 0x32, 0xf0, 0x39, 0x14, 0x26, 0xe6,
+	0x68, 0x4a, 0x83, 0xa8, 0xb1, 0xc0, 0x99, 0x9f, 0xaf, 0xcb, 0x6c, 0xc5, 0xb4, 0x64, 0x85, 0x84,
+	0x4f, 0xa1, 0x30, 0xb6, 0x47, 0x17, 0x81, 0xe1, 0xd3, 0xa9, 0xef, 0x78, 0x62, 0x9e, 0x93, 0x9f,
+	0xae, 0xbd, 0xf4, 0x98, 0xb6, 0xcb, 0xa5, 0x24, 0x3f, 0x5e, 0x16, 0xd8, 0x3c, 0xf9, 0x96, 0x47,
+	0xe9, 0x54, 0x2c, 0x6c, 0x36, 0x4f, 0x5d, 0xae, 0x22, 0x91, 0x1a, 0x77, 0x21, 0x3f, 0x74, 0xbc,
+	0x89, 0x31, 0x34, 0xad, 0xc0, 0xf1, 0xc4, 0x22, 0x87, 0x1d, 0xac, 0xbd, 0x24, 0x1d, 0x6f, 0xd2,
+	0xe0, 0x4a, 0x02, 0xc3, 0xc5, 0x33, 0x6f, 0x5c, 0x70, 0x3d, 0x9e, 0xf9, 0x62, 0x69, 0xc3, 0xc6,
+	0x71, 0x15, 0x89, 0xd4, 0x58, 0x85, 0xec, 0x25, 0xbd, 0xee, 0x3b, 0xa6, 0x37, 0x10, 0x77, 0x39,
+	0x69, 0x6f, 0x5d, 0xd2, 0xab, 0x48, 0x47, 0x16, 0x04, 0xd6, 0xaa, 0x09, 0x9d, 0x38, 0xde, 0xb5,
+	0x88, 0x36, 0x6b, 0x55, 0x8b, 0xab, 0x48, 0xa4, 0xc6, 0x3d, 0xc8, 0x0f, 0xed, 0xe9, 0x88, 0x7a,
+	0xae, 0x67, 0x4f, 0x03, 0xf1, 0xce, 0x66, 0x33, 0xda, 0x58, 0x4a, 0x49, 0x9c, 0x83, 0x9b, 0xb0,
+	0xe3, 0x07, 0x8e, 0x67, 0x8e, 0xa8, 0x88, 0x39, 0xf2, 0xc9, 0xfa, 0xa3, 0xc6, 0x65, 0x64, 0xae,
+	0x67, 0xfb, 0xa3, 0x3f, 0x9e, 0xd1, 0xc0, 0x71, 0x82, 0x0b, 0xf1, 0xee, 0x66, 0xfb, 0xa3, 0x36,
+	0x17, 0x92, 0x25, 0x03, 0x13, 0x80, 0xbe, 0xe9, 0x79, 0x74, 0xfc, 0xad, 0x69, 0x5d, 0x8a, 0xf7,
+	0x36, 0x5b, 0x24, 0x35, 0xae, 0x7c, 0x69, 0x5a, 0x97, 0x24, 0x46, 0x61, 0x87, 0xe9, 0x95, 0x3d,
+	0xb4, 0xc5, 0x87, 0x9b, 0x1d, 0xa6, 0x67, 0xf6, 0xd0, 0x26, 0x5c, 0x89, 0x5f, 0x43, 0xc1, 0x75,
+	0xae, 0xa8, 0x67, 0xf4, 0x67, 0x41, 0xe0, 0x4c, 0xc5, 0xfb, 0x9b, 0x4d, 0x6b, 0x8d, 0xab, 0x48,
+	0x9e, 0x33, 0xc2, 0x02, 0xee, 0x42, 0xf1, 0xad, 0x33, 0x9e, 0x4d, 0xe8, 0x9c, 0xf9, 0x60, 0x2b,
+	0x66, 0x21, 0x84, 0x44, 0xd0, 0x4b, 0xb8, 0x4b, 0x27, 0x7d, 0x3a, 0x18, 0xd0, 0x01, 0x3b, 0xfa,
+	0x03, 0xcf, 0x19, 0x8f, 0xa9, 0x27, 0x8a, 0x1c, 0xfd, 0xc5, 0xba, 0x68, 0x25, 0x42, 0xc8, 0x0b,
+	0x02, 0xc1, 0xf4, 0x1d, 0x5b, 0xf9, 0x13, 0x48, 0xcb, 0xce, 0x6c, 0x1a, 0x2c, 0x5d, 0x26, 0x76,
+	0xe3, 0x16, 0x23, 0x97, 0xa9, 0xfc, 0x0a, 0x52, 0xec, 0x4a, 0x65, 0x97, 0x85, 0xc5, 0xaa, 0x45,
+	0xf7, 0xf1, 0xda, 0x97, 0x05, 0x67, 0x93, 0x50, 0x1b, 0xc1, 0xa4, 0x0f, 0x03, 0xeb, 0x40, 0x52,
+	0x0d, 0x28, 0xdb, 0x06, 0xae, 0x47, 0x7d, 0x1a, 0xd1, 0x4a, 0xeb, 0x6f, 0x83, 0x4e, 0x28, 0x23,
+	0x73, 0x7d, 0xf9, 0x35, 0xa4, 0xd8, 0xd5, 0xfb, 0x21, 0x91, 0x12, 0xdc, 0xbf, 0xf5, 0x1a, 0xbe,
+	0x7d, 0xb4, 0x31, 0x86, 0xd4, 0xc4, 0xf4, 0x2f, 0xb9, 0xc7, 0x52, 0x24, 0xfc, 0xb9, 0xfc, 0x97,
+	0x24, 0xa4, 0xf9, 0x95, 0x8b, 0xdf, 0x40, 0x9e, 0x5f, 0xba, 0x86, 0xe5, 0x0c, 0xa8, 0x15, 0xb5,
+	0xed, 0x68, 0xa3, 0x6b, 0x3b, 0xfc, 0x2b, 0x33, 0x3d, 0x01, 0x73, 0xf1, 0xcc, 0xd0, 0xbe, 0x4b,
+	0xcd, 0x4b, 0xea, 0x19, 0xe6, 0xc4, 0x8d, 0xc2, 0x87, 0xef, 0x81, 0x8e, 0x60, 0xd2, 0xc4, 0xc5,
+	0x26, 0xec, 0x5e, 0x50, 0x73, 0xe0, 0x5e, 0x38, 0x53, 0x1a, 0xb5, 0x3c, 0xf9, 0x3d, 0xf1, 0xa5,
+	0x05, 0x90, 0x97, 0x2b, 0xbf, 0x4b, 0x00, 0x2c, 0x5f, 0xe3, 0x87, 0x70, 0x97, 0xbb, 0xea, 0x86,
+	0xac, 0xd5, 0x15, 0x79, 0xd5, 0xc1, 0x27, 0xfa, 0xe1, 0xb3, 0xa3, 0x03, 0x94, 0x60, 0x8e, 0xbb,
+	0xa4, 0xca, 0xac, 0xd0, 0x44, 0x02, 0x73, 0xdc, 0xa3, 0x12, 0x4a, 0xb2, 0x57, 0x2d, 0xe9, 0xfc,
+	0xc5, 0xd1, 0xd3, 0xc3, 0xe7, 0xa1, 0x87, 0x1f, 0x96, 0x9e, 0x3f, 0x45, 0xe9, 0x65, 0xe9, 0xd9,
+	0x5e, 0xe8, 0xe2, 0x13, 0x7d, 0x7f, 0x6f, 0xff, 0x10, 0xed, 0xb0, 0xe7, 0xba, 0xf4, 0xfc, 0x60,
+	0xff, 0x05, 0xca, 0x46, 0xb8, 0xfd, 0xbd, 0xfd, 0x7d, 0x94, 0x2b, 0xff, 0x39, 0x03, 0x99, 0xd0,
+	0xdb, 0xc1, 0x1a, 0xec, 0x0c, 0xe8, 0x5b, 0xdb, 0xa2, 0xbe, 0x98, 0xe2, 0x01, 0xd6, 0xe1, 0x66,
+	0xee, 0x52, 0xb5, 0xce, 0xd5, 0x64, 0x4e, 0x29, 0xff, 0x2a, 0x09, 0x99, 0xd0, 0x86, 0x4f, 0x21,
+	0x67, 0x4f, 0x03, 0xea, 0x0d, 0x4d, 0x8b, 0x6e, 0x3a, 0x81, 0x11, 0xbd, 0x39, 0xd7, 0x93, 0x25,
+	0x0a, 0xb7, 0x20, 0x33, 0x34, 0x2d, 0x7b, 0x3a, 0x8a, 0xa6, 0x6d, 0xd3, 0x26, 0x37, 0xb8, 0x98,
+	0x44, 0x10, 0xfc, 0x0d, 0xe4, 0x1d, 0xcf, 0xa6, 0xd3, 0x80, 0xef, 0x03, 0xee, 0x1a, 0x97, 0xd6,
+	0x3f, 0xd4, 0x22, 0xa6, 0xb6, 0x24, 0x90, 0x38, 0x8e, 0x6d, 0xab, 0xe1, 0xd8, 0x1c, 0xf9, 0xdc,
+	0x57, 0x2e, 0x92, 0xb0, 0xc0, 0xe2, 0x43, 0x7b, 0xe0, 0x8b, 0x99, 0x47, 0x49, 0x16, 0x1f, 0xda,
+	0x03, 0x1f, 0x9f, 0x42, 0xc9, 0xf5, 0xec, 0xb7, 0xa6, 0x75, 0x6d, 0xf8, 0x57, 0x76, 0x60, 0x5d,
+	0x70, 0xf7, 0x75, 0x8b, 0x9d, 0x5e, 0x8c, 0x30, 0x5d, 0x4e, 0xa9, 0x34, 0x21, 0xb7, 0x18, 0x44,
+	0x7c, 0x1f, 0xee, 0x34, 0xdb, 0xba, 0x42, 0x1a, 0x92, 0x1c, 0x0f, 0x33, 0xef, 0x40, 0x31, 0x66,
+	0xee, 0xd6, 0x50, 0x82, 0x45, 0x73, 0x4b, 0x53, 0xab, 0xd9, 0x69, 0x22, 0xa1, 0xf2, 0x53, 0xc8,
+	0x84, 0x43, 0xc7, 0xde, 0x36, 0x24, 0xb9, 0xd9, 0x3e, 0x8e, 0x41, 0x10, 0x14, 0x22, 0x5b, 0x83,
+	0x68, 0x6d, 0x3d, 0x8a, 0x58, 0x43, 0x4b, 0x8d, 0xc5, 0x63, 0x42, 0xe5, 0x0a, 0xf2, 0xb1, 0x71,
+	0x62, 0xbb, 0x42, 0x23, 0x4d, 0xa5, 0xad, 0x4b, 0x7a, 0x53, 0x6b, 0xaf, 0xb6, 0x27, 0xfe, 0x62,
+	0x2f, 0x6c, 0x4f, 0xdc, 0xf4, 0x62, 0x0f, 0x09, 0x2c, 0x24, 0x8c, 0xdb, 0xf6, 0x8f, 0xf6, 0x50,
+	0xf2, 0xa6, 0xf1, 0xe0, 0xf9, 0x1e, 0x4a, 0x55, 0x5a, 0x90, 0x6e, 0xf0, 0x71, 0x2f, 0x01, 0x34,
+	0x54, 0xe9, 0xb8, 0x6b, 0xb4, 0xb5, 0xb6, 0x82, 0x3e, 0x62, 0x4d, 0x08, 0xcb, 0xdd, 0x5e, 0xa7,
+	0xa3, 0x11, 0xdd, 0xd8, 0xdf, 0x3b, 0xda, 0xeb, 0xa0, 0x04, 0xfe, 0x3f, 0x78, 0xb8, 0xfa, 0x42,
+	0xea, 0xe9, 0x5a, 0x43, 0x93, 0x7b, 0x5d, 0x24, 0x94, 0xff, 0x91, 0x80, 0xe2, 0x8a, 0x7b, 0x8f,
+	0xbf, 0x81, 0x3b, 0x63, 0x7b, 0x60, 0xac, 0x06, 0x0c, 0x5b, 0x1e, 0xd5, 0x68, 0x6c, 0x0f, 0x56,
+	0xe9, 0xbf, 0x00, 0xdc, 0x37, 0x7d, 0x7a, 0x03, 0x2f, 0x6c, 0x87, 0xbf, 0xc3, 0x50, 0x2b, 0xfc,
+	0xf2, 0x9f, 0x12, 0x90, 0x5b, 0x44, 0x15, 0x58, 0x87, 0x22, 0xeb, 0xcb, 0x32, 0x3e, 0xd9, 0xb2,
+	0x1f, 0x85, 0xb1, 0x3d, 0x58, 0x52, 0x4f, 0xa1, 0xc4, 0xfb, 0xb0, 0xc4, 0x6e, 0xd9, 0xfe, 0x22,
+	0xc3, 0x2c, 0xb8, 0xe5, 0xbf, 0x25, 0xa0, 0x10, 0x8f, 0x5e, 0xf0, 0xd7, 0xc0, 0x06, 0xd0, 0x58,
+	0x89, 0x86, 0xb6, 0xec, 0xc1, 0xee, 0xd8, 0x1e, 0xac, 0xb0, 0xbf, 0x01, 0x3e, 0x7a, 0xab, 0xf0,
+	0x2d, 0xfb, 0x81, 0x18, 0x29, 0x4e, 0x2f, 0xff, 0x35, 0x01, 0xf9, 0x58, 0xb8, 0x84, 0xcf, 0x81,
+	0x35, 0xc0, 0xe0, 0x41, 0x53, 0x14, 0x7c, 0x6d, 0xd9, 0x91, 0xd2, 0xd8, 0x1e, 0xa8, 0x4b, 0x0c,
+	0x1b, 0x23, 0xde, 0x8f, 0x38, 0x7a, 0xcb, 0x6e, 0xec, 0x32, 0x50, 0x8c, 0x5d, 0xfe, 0x7b, 0x02,
+	0x32, 0x61, 0x88, 0x86, 0x2d, 0x40, 0xae, 0x39, 0xa5, 0x63, 0xc3, 0xf5, 0x1c, 0x97, 0x7a, 0x81,
+	0x4d, 0xfd, 0x28, 0x73, 0xf1, 0x5d, 0xf7, 0x80, 0xbc, 0x48, 0x2d, 0xd6, 0x6d, 0xdf, 0x1d, 0x9b,
+	0xd7, 0x1d, 0xa6, 0xaf, 0x76, 0x16, 0x7a, 0xb2, 0xcb, 0x89, 0x4b, 0x03, 0x5b, 0xae, 0x81, 0x33,
+	0xb3, 0x2e, 0x0c, 0x7f, 0xe6, 0xba, 0x8e, 0x17, 0x6c, 0xdb, 0x91, 0x02, 0xa7, 0x74, 0x43, 0xc8,
+	0xcb, 0x54, 0x36, 0x81, 0x84, 0xf2, 0x2f, 0x05, 0x80, 0x65, 0x84, 0x88, 0xfb, 0xab, 0xa1, 0x66,
+	0x38, 0x19, 0xd2, 0xe6, 0xa1, 0x66, 0xec, 0x91, 0xe7, 0x3b, 0x63, 0x91, 0x67, 0xe5, 0x37, 0x09,
+	0x28, 0xad, 0xbe, 0xe6, 0x87, 0xd4, 0x32, 0xf3, 0x17, 0x3b, 0x27, 0x8b, 0x90, 0x93, 0x55, 0xa9,
+	0xd5, 0x3d, 0x51, 0x54, 0x35, 0x3c, 0x6f, 0x65, 0xad, 0x7d, 0xaa, 0x10, 0xbd, 0x59, 0x53, 0x15,
+	0x24, 0xb0, 0xd3, 0xae, 0xae, 0xe8, 0x92, 0x7c, 0x22, 0xb1, 0x72, 0x92, 0x95, 0xe5, 0x13, 0xa2,
+	0xb5, 0x94, 0x9a, 0xd4, 0x55, 0x50, 0x8a, 0xeb, 0xc3, 0xb2, 0x76, 0x8e, 0xd2, 0xb1, 0x62, 0x53,
+	0x47, 0x19, 0x8e, 0xe3, 0xc5, 0xae, 0x2a, 0xe9, 0x0a, 0xda, 0x29, 0xff, 0x9e, 0xcd, 0x6c, 0x18,
+	0xd7, 0xbe, 0x5e, 0xc4, 0xc7, 0xe1, 0x20, 0xbc, 0xd8, 0x2c, 0x3e, 0x8e, 0xfe, 0xf1, 0xce, 0x47,
+	0xa0, 0x4a, 0x03, 0x60, 0x69, 0x65, 0xe7, 0x7d, 0x98, 0xd1, 0x8c, 0x75, 0x37, 0x0b, 0x29, 0x7e,
+	0x6c, 0x73, 0x57, 0x89, 0xdf, 0x4e, 0x6d, 0x49, 0x45, 0x02, 0x2b, 0x29, 0xe7, 0x51, 0x29, 0x59,
+	0xfe, 0xaf, 0x00, 0xd9, 0x79, 0xec, 0x8c, 0xfb, 0x50, 0x9c, 0x47, 0xcf, 0x06, 0x4f, 0x43, 0x87,
+	0xcd, 0xfd, 0x6a, 0xd3, 0x20, 0x7c, 0xf1, 0xc0, 0x9b, 0x5c, 0xb8, 0x8c, 0x95, 0x70, 0x0b, 0x72,
+	0x7d, 0xd3, 0xba, 0xe4, 0x7b, 0x69, 0xdb, 0xc5, 0xb7, 0x24, 0x60, 0x72, 0x23, 0x26, 0x4c, 0x6e,
+	0x47, 0x8c, 0x07, 0x85, 0x95, 0xd7, 0x50, 0x88, 0x77, 0x00, 0x7f, 0x0c, 0xf7, 0xe7, 0x39, 0x62,
+	0xe3, 0x46, 0xca, 0x39, 0x3e, 0xb4, 0x89, 0xc5, 0x90, 0xbf, 0xb3, 0x96, 0xca, 0x5d, 0xc8, 0x84,
+	0x59, 0x85, 0x30, 0x38, 0x71, 0x86, 0xf6, 0x98, 0x46, 0xd1, 0xd3, 0x93, 0xf7, 0x6e, 0xee, 0x50,
+	0xc9, 0xb6, 0x35, 0x93, 0x91, 0xb9, 0xbe, 0xfc, 0x2f, 0x01, 0xf2, 0xb1, 0xf4, 0x02, 0x3e, 0x87,
+	0xec, 0xd8, 0xb1, 0x42, 0xbf, 0x2c, 0x9c, 0xb9, 0x2f, 0xb7, 0xc8, 0x52, 0x54, 0xd5, 0x88, 0x41,
+	0x16, 0x34, 0xe6, 0x96, 0x85, 0x59, 0x99, 0x28, 0x1d, 0x1f, 0x2e, 0x97, 0x4f, 0x00, 0x3c, 0xc7,
+	0x78, 0x4b, 0x3d, 0xdf, 0x8e, 0x46, 0x3e, 0x47, 0x72, 0x9e, 0x73, 0x1a, 0x1a, 0x2a, 0x7f, 0x48,
+	0x40, 0x56, 0x5d, 0x12, 0x90, 0xaa, 0xc9, 0x37, 0x5d, 0x97, 0x8f, 0xe1, 0x7e, 0x3c, 0xe5, 0x6c,
+	0xe8, 0x5a, 0xc7, 0x50, 0x95, 0x06, 0x73, 0x87, 0x44, 0xb8, 0xb7, 0x18, 0xf4, 0x9a, 0xa6, 0xeb,
+	0x5a, 0x2b, 0x7c, 0x23, 0xac, 0x4c, 0x47, 0xf4, 0x86, 0x34, 0x8f, 0x4f, 0x74, 0x94, 0xc4, 0x0f,
+	0x00, 0x2f, 0x67, 0x4a, 0xeb, 0x44, 0xf6, 0x14, 0xdb, 0x9c, 0x6d, 0x4d, 0x37, 0x3a, 0x44, 0xe9,
+	0x2a, 0x6d, 0x1d, 0xa5, 0x99, 0xc3, 0xb2, 0xf2, 0xe1, 0x6e, 0xb3, 0xae, 0x44, 0xb5, 0x33, 0xe5,
+	0x3e, 0xec, 0x44, 0x29, 0x16, 0x7c, 0x06, 0x85, 0x28, 0xc9, 0x12, 0xdf, 0x10, 0x9f, 0xbf, 0x77,
+	0xca, 0x22, 0xfd, 0xfc, 0x3f, 0xdf, 0x07, 0x79, 0x7f, 0x59, 0x28, 0xf7, 0x20, 0xb7, 0xc8, 0xbc,
+	0xe0, 0x13, 0xc8, 0x2d, 0x7e, 0x25, 0x8a, 0x56, 0xc5, 0x67, 0xef, 0xfd, 0x44, 0x2c, 0x71, 0xb3,
+	0x10, 0x97, 0xcf, 0x00, 0x96, 0xe9, 0x97, 0x0f, 0x19, 0x08, 0xff, 0x56, 0x80, 0xd4, 0x99, 0x3d,
+	0xb4, 0xf1, 0x18, 0xc4, 0xe8, 0xea, 0xa0, 0x03, 0xe3, 0x6a, 0x6c, 0x4e, 0x0d, 0xfe, 0xb3, 0x96,
+	0xe5, 0x8c, 0xd9, 0xe9, 0x96, 0x7c, 0x5c, 0xfa, 0xce, 0x44, 0xd1, 0xb2, 0xe9, 0x0c, 0x54, 0x3d,
+	0x53, 0xa5, 0x76, 0x27, 0x92, 0x92, 0x07, 0x0b, 0xe6, 0xd9, 0xd8, 0x9c, 0xce, 0xcd, 0xec, 0xba,
+	0x82, 0x2b, 0x7b, 0x68, 0x1b, 0xd6, 0x85, 0xed, 0xfa, 0xa2, 0xc0, 0xf9, 0x87, 0x9b, 0xa4, 0x8e,
+	0xf8, 0x1f, 0xf9, 0xc2, 0x76, 0x49, 0xee, 0x2a, 0x7a, 0xf2, 0x2b, 0x6d, 0xc8, 0xce, 0xcd, 0xcc,
+	0xc9, 0x3f, 0x6b, 0x36, 0x9a, 0x86, 0x7c, 0xd2, 0xec, 0xc4, 0x56, 0x26, 0x37, 0x13, 0x45, 0x55,
+	0xba, 0x5d, 0xe3, 0xe8, 0x99, 0x52, 0x3f, 0xda, 0xdb, 0xaf, 0xa3, 0x04, 0x5b, 0xc6, 0x0b, 0x33,
+	0x51, 0x24, 0x55, 0x57, 0x5e, 0x21, 0xa1, 0xfc, 0x47, 0x01, 0x32, 0x51, 0xee, 0xa7, 0x05, 0x19,
+	0x8f, 0x8e, 0x96, 0x3b, 0xf0, 0x70, 0xb3, 0x4c, 0x52, 0x95, 0x70, 0x31, 0x89, 0x20, 0xf8, 0x18,
+	0x52, 0x74, 0x30, 0x9a, 0x7b, 0x7f, 0x4f, 0x37, 0x84, 0x29, 0x83, 0x11, 0x25, 0x1c, 0x80, 0xcb,
+	0x90, 0x75, 0x1d, 0xdf, 0x0e, 0xe6, 0x3b, 0x55, 0x20, 0x8b, 0x72, 0xe5, 0x19, 0x64, 0xc2, 0xcf,
+	0xb2, 0x7b, 0x84, 0x28, 0xc7, 0xab, 0x7b, 0x34, 0xfe, 0xab, 0x5a, 0xfc, 0xd7, 0x32, 0xa1, 0x52,
+	0x83, 0x14, 0xfb, 0x02, 0x8b, 0x65, 0x94, 0xfa, 0xb1, 0xb2, 0x7a, 0xf7, 0x44, 0xdb, 0x38, 0x07,
+	0xe9, 0x70, 0x5b, 0x09, 0x78, 0x07, 0x92, 0xba, 0xd6, 0x09, 0x7f, 0x7f, 0x0b, 0xf7, 0x2d, 0x4a,
+	0x95, 0xff, 0x23, 0x00, 0x7e, 0x37, 0xd3, 0xf5, 0x01, 0x57, 0x2e, 0xfe, 0x16, 0x76, 0xa8, 0x65,
+	0xc4, 0x7e, 0x55, 0x7d, 0xbd, 0x7d, 0x06, 0xee, 0x16, 0x53, 0x78, 0x2b, 0x53, 0x8b, 0xdf, 0x14,
+	0xc7, 0x90, 0x72, 0x4d, 0x2f, 0x88, 0xdc, 0xb6, 0xa7, 0xef, 0xdd, 0x08, 0xb7, 0xe4, 0xf8, 0x38,
+	0xa0, 0xf2, 0x12, 0x1e, 0xdc, 0xfe, 0x29, 0x16, 0xb1, 0x29, 0xf2, 0xcd, 0x6b, 0xa8, 0x08, 0x39,
+	0x45, 0x36, 0x42, 0xff, 0x23, 0x9c, 0x26, 0x45, 0x36, 0xce, 0x9a, 0xaa, 0xac, 0x21, 0xa1, 0xf2,
+	0x25, 0xec, 0x44, 0x83, 0xc2, 0xc4, 0xd1, 0x19, 0x18, 0x13, 0xe7, 0x61, 0x67, 0x7e, 0x30, 0x26,
+	0x6e, 0x9e, 0x94, 0x42, 0xed, 0xb3, 0xaf, 0x1f, 0x8f, 0x9c, 0x45, 0x47, 0xaa, 0x8e, 0x37, 0x7a,
+	0xf2, 0xee, 0xef, 0xdc, 0x23, 0xe7, 0x89, 0xe9, 0xda, 0xfd, 0x0c, 0x3f, 0x0a, 0x9e, 0xfe, 0x2f,
+	0x00, 0x00, 0xff, 0xff, 0x9b, 0x9f, 0x8b, 0x67, 0x47, 0x1f, 0x00, 0x00,
 }
diff --git a/payload_utils/test_data/fake_project.json b/payload_utils/test_data/fake_project.json
index 287cbf0..a16f4d4 100644
--- a/payload_utils/test_data/fake_project.json
+++ b/payload_utils/test_data/fake_project.json
@@ -79,7 +79,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -224,7 +224,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25344,
+          "firmware-config": 90880,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -388,7 +388,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -511,7 +511,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25376,
+          "firmware-config": 90912,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -628,7 +628,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -745,7 +745,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -863,7 +863,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -982,7 +982,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -1101,7 +1101,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -1198,7 +1198,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25345,
+          "firmware-config": 90881,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
diff --git a/payload_utils/test_data/model_sku.json b/payload_utils/test_data/model_sku.json
index 2d16262..ffb8511 100644
--- a/payload_utils/test_data/model_sku.json
+++ b/payload_utils/test_data/model_sku.json
@@ -72,7 +72,7 @@
         ]
       ],
       "component.speaker_amp": "MAX98373",
-      "fw_config": 25377
+      "fw_config": 90913
     },
     "project_b": {
       "component.audio_card_name": "fakeaudiocard",
@@ -122,7 +122,7 @@
         ]
       ],
       "component.speaker_amp": "MAX98373",
-      "fw_config": 25376
+      "fw_config": 90912
     },
     "project_box": {
       "component.audio_card_name": "fakeaudiocard",
@@ -172,7 +172,7 @@
         ]
       ],
       "component.speaker_amp": "MAX98373",
-      "fw_config": 25345
+      "fw_config": 90881
     },
     "project_c": {
       "component.audio_card_name": "fakeaudiocard",
@@ -222,7 +222,7 @@
         ]
       ],
       "component.speaker_amp": "MAX98373",
-      "fw_config": 25377
+      "fw_config": 90913
     },
     "project_wl": {
       "component.audio_card_name": "fakeaudiocard",
@@ -272,7 +272,7 @@
         ]
       ],
       "component.speaker_amp": "MAX98373",
-      "fw_config": 25377
+      "fw_config": 90913
     }
   },
   "product_sku": {
@@ -303,7 +303,7 @@
             1
           ]
         ],
-        "fw_config": 25344
+        "fw_config": 90880
       },
       "2147483647": {
         "component.fingerprint_board": "fake_fingerprint_board",
@@ -331,7 +331,7 @@
             1
           ]
         ],
-        "fw_config": 25377
+        "fw_config": 90913
       }
     },
     "PROJECT_A": {
diff --git a/proto/chromiumos/config/api/hardware_topology.md b/proto/chromiumos/config/api/hardware_topology.md
index f89c273..c81805b 100644
--- a/proto/chromiumos/config/api/hardware_topology.md
+++ b/proto/chromiumos/config/api/hardware_topology.md
@@ -227,3 +227,13 @@
 Changes that do not require new topology
 
 * EC capabilities, such as usbpd or keyboard
+
+## Touch
+
+Changes that require new topology
+
+* Needs switching the different feature like numpad in the fw
+
+Changes that do not require new topology
+
+* Different touch controller vendor which supports the same feature set
diff --git a/proto/chromiumos/config/api/hardware_topology.proto b/proto/chromiumos/config/api/hardware_topology.proto
index fb55bcc..8e0a23e 100644
--- a/proto/chromiumos/config/api/hardware_topology.proto
+++ b/proto/chromiumos/config/api/hardware_topology.proto
@@ -107,4 +107,8 @@
   // Specify the EC topology.
   // See ./hardware_topology.md#ec for more information.
   Topology ec = 22;
+
+  // Specify the touch topology.
+  // See ./hardware_topology.md#touch for more information.
+  Topology touch = 23;
 }
diff --git a/proto/chromiumos/config/api/topology.proto b/proto/chromiumos/config/api/topology.proto
index 09d19e0..dcaba00 100644
--- a/proto/chromiumos/config/api/topology.proto
+++ b/proto/chromiumos/config/api/topology.proto
@@ -53,6 +53,7 @@
     POWER_BUTTON = 20;
     VOLUME_BUTTON = 21;
     EC = 22;
+    TOUCH = 23;
   }
 
   // Map of human readable descriptions in various languages. Maps language
diff --git a/python/chromiumos/config/api/hardware_topology_pb2.py b/python/chromiumos/config/api/hardware_topology_pb2.py
index c5b4e31..6986a4b 100644
--- a/python/chromiumos/config/api/hardware_topology_pb2.py
+++ b/python/chromiumos/config/api/hardware_topology_pb2.py
@@ -20,7 +20,7 @@
   package='chromiumos.config.api',
   syntax='proto3',
   serialized_options=_b('Z(go.chromium.org/chromiumos/config/go/api'),
-  serialized_pb=_b('\n-chromiumos/config/api/hardware_topology.proto\x12\x15\x63hromiumos.config.api\x1a$chromiumos/config/api/topology.proto\"\xac\t\n\x10HardwareTopology\x12/\n\x06screen\x18\x01 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x34\n\x0b\x66orm_factor\x18\x02 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12.\n\x05\x61udio\x18\x03 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12/\n\x06stylus\x18\x04 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x31\n\x08keyboard\x18\x05 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x30\n\x07thermal\x18\x06 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12/\n\x06\x63\x61mera\x18\x07 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12M\n$accelerometer_gyroscope_magnetometer\x18\x08 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x34\n\x0b\x66ingerprint\x18\t \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x39\n\x10proximity_sensor\x18\n \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x37\n\x0e\x64\x61ughter_board\x18\x0b \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12=\n\x14non_volatile_storage\x18\x0c \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12,\n\x03ram\x18\r \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12-\n\x04wifi\x18\x0e \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x32\n\tlte_board\x18\x0f \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x32\n\tsd_reader\x18\x10 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x38\n\x0fmotherboard_usb\x18\x11 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x32\n\tbluetooth\x18\x12 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x33\n\nbarreljack\x18\x13 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x35\n\x0cpower_button\x18\x14 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x36\n\rvolume_button\x18\x15 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12+\n\x02\x65\x63\x18\x16 \x01(\x0b\x32\x1f.chromiumos.config.api.TopologyB*Z(go.chromium.org/chromiumos/config/go/apib\x06proto3')
+  serialized_pb=_b('\n-chromiumos/config/api/hardware_topology.proto\x12\x15\x63hromiumos.config.api\x1a$chromiumos/config/api/topology.proto\"\xdc\t\n\x10HardwareTopology\x12/\n\x06screen\x18\x01 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x34\n\x0b\x66orm_factor\x18\x02 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12.\n\x05\x61udio\x18\x03 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12/\n\x06stylus\x18\x04 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x31\n\x08keyboard\x18\x05 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x30\n\x07thermal\x18\x06 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12/\n\x06\x63\x61mera\x18\x07 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12M\n$accelerometer_gyroscope_magnetometer\x18\x08 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x34\n\x0b\x66ingerprint\x18\t \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x39\n\x10proximity_sensor\x18\n \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x37\n\x0e\x64\x61ughter_board\x18\x0b \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12=\n\x14non_volatile_storage\x18\x0c \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12,\n\x03ram\x18\r \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12-\n\x04wifi\x18\x0e \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x32\n\tlte_board\x18\x0f \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x32\n\tsd_reader\x18\x10 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x38\n\x0fmotherboard_usb\x18\x11 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x32\n\tbluetooth\x18\x12 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x33\n\nbarreljack\x18\x13 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x35\n\x0cpower_button\x18\x14 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12\x36\n\rvolume_button\x18\x15 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12+\n\x02\x65\x63\x18\x16 \x01(\x0b\x32\x1f.chromiumos.config.api.Topology\x12.\n\x05touch\x18\x17 \x01(\x0b\x32\x1f.chromiumos.config.api.TopologyB*Z(go.chromium.org/chromiumos/config/go/apib\x06proto3')
   ,
   dependencies=[chromiumos_dot_config_dot_api_dot_topology__pb2.DESCRIPTOR,])
 
@@ -188,6 +188,13 @@
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='touch', full_name='chromiumos.config.api.HardwareTopology.touch', index=22,
+      number=23, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -201,7 +208,7 @@
   oneofs=[
   ],
   serialized_start=111,
-  serialized_end=1307,
+  serialized_end=1355,
 )
 
 _HARDWARETOPOLOGY.fields_by_name['screen'].message_type = chromiumos_dot_config_dot_api_dot_topology__pb2._TOPOLOGY
@@ -226,6 +233,7 @@
 _HARDWARETOPOLOGY.fields_by_name['power_button'].message_type = chromiumos_dot_config_dot_api_dot_topology__pb2._TOPOLOGY
 _HARDWARETOPOLOGY.fields_by_name['volume_button'].message_type = chromiumos_dot_config_dot_api_dot_topology__pb2._TOPOLOGY
 _HARDWARETOPOLOGY.fields_by_name['ec'].message_type = chromiumos_dot_config_dot_api_dot_topology__pb2._TOPOLOGY
+_HARDWARETOPOLOGY.fields_by_name['touch'].message_type = chromiumos_dot_config_dot_api_dot_topology__pb2._TOPOLOGY
 DESCRIPTOR.message_types_by_name['HardwareTopology'] = _HARDWARETOPOLOGY
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
diff --git a/python/chromiumos/config/api/topology_pb2.py b/python/chromiumos/config/api/topology_pb2.py
index 04783e8..d0c426a 100644
--- a/python/chromiumos/config/api/topology_pb2.py
+++ b/python/chromiumos/config/api/topology_pb2.py
@@ -20,7 +20,7 @@
   package='chromiumos.config.api',
   syntax='proto3',
   serialized_options=_b('Z(go.chromium.org/chromiumos/config/go/api'),
-  serialized_pb=_b('\n$chromiumos/config/api/topology.proto\x12\x15\x63hromiumos.config.api\x1a%chromiumos/config/api/component.proto\"\x8f\x05\n\x08Topology\x12\n\n\x02id\x18\x01 \x01(\t\x12\x32\n\x04type\x18\x02 \x01(\x0e\x32$.chromiumos.config.api.Topology.Type\x12\x45\n\x0b\x64\x65scription\x18\x03 \x03(\x0b\x32\x30.chromiumos.config.api.Topology.DescriptionEntry\x12\x41\n\x10hardware_feature\x18\x04 \x01(\x0b\x32\'.chromiumos.config.api.HardwareFeatures\x1a\x32\n\x10\x44\x65scriptionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x84\x03\n\x04Type\x12\x10\n\x0cTYPE_UNKNOWN\x10\x00\x12\n\n\x06SCREEN\x10\x01\x12\x0f\n\x0b\x46ORM_FACTOR\x10\x02\x12\t\n\x05\x41UDIO\x10\x03\x12\n\n\x06STYLUS\x10\x04\x12\x0c\n\x08KEYBOARD\x10\x05\x12\x0b\n\x07THERMAL\x10\x06\x12\n\n\x06\x43\x41MERA\x10\x07\x12(\n$ACCELEROMETER_GYROSCOPE_MAGNETOMETER\x10\x08\x12\x0f\n\x0b\x46INGERPRINT\x10\t\x12\x14\n\x10PROXIMITY_SENSOR\x10\n\x12\x12\n\x0e\x44\x41UGHTER_BOARD\x10\x0b\x12\x18\n\x14NON_VOLATILE_STORAGE\x10\x0c\x12\x07\n\x03RAM\x10\r\x12\x08\n\x04WIFI\x10\x0e\x12\r\n\tLTE_BOARD\x10\x0f\x12\r\n\tSD_READER\x10\x10\x12\x13\n\x0fMOTHERBOARD_USB\x10\x11\x12\r\n\tBLUETOOTH\x10\x12\x12\x0e\n\nBARRELJACK\x10\x13\x12\x10\n\x0cPOWER_BUTTON\x10\x14\x12\x11\n\rVOLUME_BUTTON\x10\x15\x12\x06\n\x02\x45\x43\x10\x16\"\xcf\x31\n\x10HardwareFeatures\x12;\n\x05usb_c\x18\x01 \x01(\x0b\x32,.chromiumos.config.api.HardwareFeatures.UsbC\x12;\n\x05usb_a\x18\x02 \x01(\x0b\x32,.chromiumos.config.api.HardwareFeatures.UsbA\x12\x38\n\x03lte\x18\x03 \x01(\x0b\x32+.chromiumos.config.api.HardwareFeatures.Lte\x12:\n\x04hdmi\x18\x04 \x01(\x0b\x32,.chromiumos.config.api.HardwareFeatures.Hdmi\x12P\n\tfw_config\x18\x05 \x01(\x0b\x32=.chromiumos.config.api.HardwareFeatures.FirmwareConfiguration\x12<\n\x05\x61udio\x18\x06 \x01(\x0b\x32-.chromiumos.config.api.HardwareFeatures.Audio\x12>\n\x06\x63\x61mera\x18\x07 \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Camera\x12L\n\raccelerometer\x18\x08 \x01(\x0b\x32\x35.chromiumos.config.api.HardwareFeatures.Accelerometer\x12\x44\n\tgyroscope\x18\t \x01(\x0b\x32\x31.chromiumos.config.api.HardwareFeatures.Gyroscope\x12J\n\x0cmagnetometer\x18\n \x01(\x0b\x32\x34.chromiumos.config.api.HardwareFeatures.Magnetometer\x12I\n\x0clight_sensor\x18\x0b \x01(\x0b\x32\x33.chromiumos.config.api.HardwareFeatures.LightSensor\x12>\n\x06screen\x18\x0c \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Screen\x12G\n\x0b\x66orm_factor\x18\r \x01(\x0b\x32\x32.chromiumos.config.api.HardwareFeatures.FormFactor\x12>\n\x06stylus\x18\x0e \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Stylus\x12\x42\n\x08keyboard\x18\x0f \x01(\x0b\x32\x30.chromiumos.config.api.HardwareFeatures.Keyboard\x12>\n\x06memory\x18\x10 \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Memory\x12H\n\x0b\x66ingerprint\x18\x11 \x01(\x0b\x32\x33.chromiumos.config.api.HardwareFeatures.Fingerprint\x12@\n\x07storage\x18\x12 \x01(\x0b\x32/.chromiumos.config.api.HardwareFeatures.Storage\x12\x44\n\tbluetooth\x18\x13 \x01(\x0b\x32\x31.chromiumos.config.api.HardwareFeatures.Bluetooth\x12\x46\n\nbarreljack\x18\x14 \x01(\x0b\x32\x32.chromiumos.config.api.HardwareFeatures.BarrelJack\x12:\n\x04wifi\x18\x17 \x01(\x0b\x32,.chromiumos.config.api.HardwareFeatures.Wifi\x12\x44\n\x0cpower_button\x18\x15 \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Button\x12\x45\n\rvolume_button\x18\x16 \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Button\x12W\n\x13\x65mbedded_controller\x18\x18 \x01(\x0b\x32:.chromiumos.config.api.HardwareFeatures.EmbeddedController\x1a\x16\n\x05\x43ount\x12\r\n\x05value\x18\x01 \x01(\r\x1a\x44\n\x04UsbC\x12<\n\x05\x63ount\x18\x01 \x01(\x0b\x32-.chromiumos.config.api.HardwareFeatures.Count\x1a\x44\n\x04UsbA\x12<\n\x05\x63ount\x18\x01 \x01(\x0b\x32-.chromiumos.config.api.HardwareFeatures.Count\x1aG\n\x03Lte\x12@\n\x07present\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1aH\n\x04Hdmi\x12@\n\x07present\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\x34\n\x15\x46irmwareConfiguration\x12\r\n\x05value\x18\x01 \x01(\r\x12\x0c\n\x04mask\x18\x02 \x01(\r\x1a\x96\x03\n\x05\x41udio\x12M\n\x0b\x61udio_codec\x18\x01 \x01(\x0e\x32\x38.chromiumos.config.api.HardwareFeatures.Audio.AudioCodec\x12M\n\x0bspeaker_amp\x18\x02 \x01(\x0e\x32\x38.chromiumos.config.api.HardwareFeatures.Audio.AudioCodec\x12Q\n\x0fheadphone_codec\x18\x03 \x01(\x0e\x32\x38.chromiumos.config.api.HardwareFeatures.Audio.AudioCodec\"\x9b\x01\n\nAudioCodec\x12\x17\n\x13\x41UDIO_CODEC_UNKNOWN\x10\x00\x12\n\n\x06RT5682\x10\x01\x12\x0c\n\x08\x41LC5682I\x10\x02\x12\x0b\n\x07\x41LC5682\x10\x03\x12\x0c\n\x08MAX98357\x10\x04\x12\x0c\n\x08MAX98373\x10\x05\x12\x0c\n\x08MAX98360\x10\x06\x12\n\n\x06RT1015\x10\x07\x12\n\n\x06\x44\x41\x37\x32\x31\x39\x10\x08\x12\x0b\n\x07\x41LC1011\x10\t\x1a\xf9\x05\n\x06\x43\x61mera\x12\x46\n\x07\x64\x65vices\x18\x04 \x03(\x0b\x32\x35.chromiumos.config.api.HardwareFeatures.Camera.Device\x1a\xd2\x02\n\x06\x44\x65vice\x12K\n\tinterface\x18\x02 \x01(\x0e\x32\x38.chromiumos.config.api.HardwareFeatures.Camera.Interface\x12\x45\n\x06\x66\x61\x63ing\x18\x03 \x01(\x0e\x32\x35.chromiumos.config.api.HardwareFeatures.Camera.Facing\x12O\n\x0borientation\x18\x04 \x01(\x0e\x32:.chromiumos.config.api.HardwareFeatures.Camera.Orientation\x12\r\n\x05\x66lags\x18\x05 \x01(\r\x12\x0b\n\x03ids\x18\x06 \x03(\t\x12G\n\x0eprivacy_switch\x18\x07 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\"I\n\tInterface\x12\x15\n\x11INTERFACE_UNKNOWN\x10\x00\x12\x11\n\rINTERFACE_USB\x10\x01\x12\x12\n\x0eINTERFACE_MIPI\x10\x02\"?\n\x06\x46\x61\x63ing\x12\x12\n\x0e\x46\x41\x43ING_UNKNOWN\x10\x00\x12\x10\n\x0c\x46\x41\x43ING_FRONT\x10\x01\x12\x0f\n\x0b\x46\x41\x43ING_BACK\x10\x02\"w\n\x0bOrientation\x12\x17\n\x13ORIENTATION_UNKNOWN\x10\x00\x12\x11\n\rORIENTATION_0\x10\x01\x12\x12\n\x0eORIENTATION_90\x10\x02\x12\x13\n\x0fORIENTATION_180\x10\x03\x12\x13\n\x0fORIENTATION_270\x10\x04\"M\n\x05\x46lags\x12\x0e\n\nFLAGS_NONE\x10\x00\x12\x17\n\x13\x46LAGS_SUPPORT_1080P\x10\x01\x12\x1b\n\x17\x46LAGS_SUPPORT_AUTOFOCUS\x10\x02\x1a\xa8\x01\n\rAccelerometer\x12J\n\x11lid_accelerometer\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12K\n\x12\x62\x61se_accelerometer\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\x9c\x01\n\tGyroscope\x12\x46\n\rlid_gyroscope\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12G\n\x0e\x62\x61se_gyroscope\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\xa5\x01\n\x0cMagnetometer\x12I\n\x10lid_magnetometer\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12J\n\x11\x62\x61se_magnetometer\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\xa2\x01\n\x0bLightSensor\x12H\n\x0flid_lightsensor\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12I\n\x10\x62\x61se_lightsensor\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\xaa\x01\n\x06Screen\x12R\n\x10panel_properties\x18\x03 \x01(\x0b\x32\x38.chromiumos.config.api.Component.DisplayPanel.Properties\x12\x46\n\rtouch_support\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.PresentJ\x04\x08\x01\x10\x02\x1a\xff\x01\n\nFormFactor\x12V\n\x0b\x66orm_factor\x18\x01 \x01(\x0e\x32\x41.chromiumos.config.api.HardwareFeatures.FormFactor.FormFactorType\"\x98\x01\n\x0e\x46ormFactorType\x12\x17\n\x13\x46ORM_FACTOR_UNKNOWN\x10\x00\x12\r\n\tCLAMSHELL\x10\x01\x12\x0f\n\x0b\x43ONVERTIBLE\x10\x02\x12\x0e\n\nDETACHABLE\x10\x03\x12\x0e\n\nCHROMEBASE\x10\x04\x12\r\n\tCHROMEBOX\x10\x05\x12\r\n\tCHROMEBIT\x10\x06\x12\x0f\n\x0b\x43HROMESLATE\x10\x07\x1a\x9b\x01\n\x06Stylus\x12I\n\x06stylus\x18\x01 \x01(\x0e\x32\x39.chromiumos.config.api.HardwareFeatures.Stylus.StylusType\"F\n\nStylusType\x12\x12\n\x0eSTYLUS_UNKNOWN\x10\x00\x12\x08\n\x04NONE\x10\x01\x12\x0c\n\x08INTERNAL\x10\x02\x12\x0c\n\x08\x45XTERNAL\x10\x03\x1a\xbe\x02\n\x08Keyboard\x12T\n\rkeyboard_type\x18\x01 \x01(\x0e\x32=.chromiumos.config.api.HardwareFeatures.Keyboard.KeyboardType\x12\x42\n\tbacklight\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12\x45\n\x0cpower_button\x18\x03 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\"Q\n\x0cKeyboardType\x12\x19\n\x15KEYBOARD_TYPE_UNKNOWN\x10\x00\x12\x0c\n\x08INTERNAL\x10\x01\x12\x08\n\x04NONE\x10\x02\x12\x0e\n\nDETACHABLE\x10\x03\x1aJ\n\x06Memory\x12@\n\x07profile\x18\x01 \x01(\x0b\x32/.chromiumos.config.api.Component.Memory.Profile\x1a\xb9\x02\n\x0b\x46ingerprint\x12N\n\x08location\x18\x01 \x01(\x0e\x32<.chromiumos.config.api.HardwareFeatures.Fingerprint.Location\x12\r\n\x05\x62oard\x18\x02 \x01(\t\x12\x12\n\nro_version\x18\x03 \x01(\t\"\xb6\x01\n\x08Location\x12\x14\n\x10LOCATION_UNKNOWN\x10\x00\x12\x19\n\x15POWER_BUTTON_TOP_LEFT\x10\x01\x12\x18\n\x14KEYBOARD_BOTTOM_LEFT\x10\x02\x12\x19\n\x15KEYBOARD_BOTTOM_RIGHT\x10\x03\x12\x16\n\x12KEYBOARD_TOP_RIGHT\x10\x04\x12\x0f\n\x0bNOT_PRESENT\x10\x05\x12\x1b\n\x17POWER_BUTTON_SIDE_RIGHT\x10\x06\x1aU\n\x07Storage\x12J\n\x0cstorage_type\x18\x01 \x01(\x0e\x32\x34.chromiumos.config.api.Component.Storage.StorageType\x1aJ\n\tBluetooth\x12=\n\tcomponent\x18\x01 \x01(\x0b\x32*.chromiumos.config.api.Component.Bluetooth\x1aN\n\nBarrelJack\x12@\n\x07present\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\xf7\x01\n\x04Wifi\x12T\n\x18supported_wlan_protocols\x18\x01 \x03(\x0e\x32\x32.chromiumos.config.api.Component.Wifi.WLANProtocol\x12I\n\nwifi_chips\x18\x02 \x03(\x0e\x32\x35.chromiumos.config.api.HardwareFeatures.Wifi.WifiChip\"N\n\x08WifiChip\x12\x15\n\x11WIFI_CHIP_UNKNOWN\x10\x00\x12\x15\n\x11WIRELESS_86ED801D\x10\x01\x12\x14\n\x10WIRELESS_REALTEK\x10\x02\x1a\xa0\x02\n\x06\x42utton\x12\x45\n\x06region\x18\x01 \x01(\x0e\x32\x35.chromiumos.config.api.HardwareFeatures.Button.Region\x12\x41\n\x04\x65\x64ge\x18\x02 \x01(\x0e\x32\x33.chromiumos.config.api.HardwareFeatures.Button.Edge\x12\x10\n\x08position\x18\x03 \x01(\x02\"6\n\x06Region\x12\x12\n\x0eREGION_UNKNOWN\x10\x00\x12\n\n\x06SCREEN\x10\x01\x12\x0c\n\x08KEYBOARD\x10\x02\"B\n\x04\x45\x64ge\x12\x10\n\x0c\x45\x44GE_UNKNOWN\x10\x00\x12\x08\n\x04LEFT\x10\x01\x12\t\n\x05RIGHT\x10\x02\x12\x07\n\x03TOP\x10\x03\x12\n\n\x06\x42OTTOM\x10\x04\x1a\xc9\x02\n\x12\x45mbeddedController\x12@\n\x07present\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12\x62\n\x07\x65\x63_type\x18\x02 \x01(\x0e\x32Q.chromiumos.config.api.HardwareFeatures.EmbeddedController.EmbeddedControllerType\x12\x41\n\x04part\x18\x03 \x01(\x0b\x32\x33.chromiumos.config.api.Component.EmbeddedController\"J\n\x16\x45mbeddedControllerType\x12\x13\n\x0f\x45\x43_TYPE_UNKNOWN\x10\x00\x12\r\n\tEC_CHROME\x10\x01\x12\x0c\n\x08\x45\x43_WILCO\x10\x02\"<\n\x07Present\x12\x13\n\x0fPRESENT_UNKNOWN\x10\x00\x12\x0b\n\x07PRESENT\x10\x01\x12\x0f\n\x0bNOT_PRESENT\x10\x02\x42*Z(go.chromium.org/chromiumos/config/go/apib\x06proto3')
+  serialized_pb=_b('\n$chromiumos/config/api/topology.proto\x12\x15\x63hromiumos.config.api\x1a%chromiumos/config/api/component.proto\"\x9a\x05\n\x08Topology\x12\n\n\x02id\x18\x01 \x01(\t\x12\x32\n\x04type\x18\x02 \x01(\x0e\x32$.chromiumos.config.api.Topology.Type\x12\x45\n\x0b\x64\x65scription\x18\x03 \x03(\x0b\x32\x30.chromiumos.config.api.Topology.DescriptionEntry\x12\x41\n\x10hardware_feature\x18\x04 \x01(\x0b\x32\'.chromiumos.config.api.HardwareFeatures\x1a\x32\n\x10\x44\x65scriptionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x8f\x03\n\x04Type\x12\x10\n\x0cTYPE_UNKNOWN\x10\x00\x12\n\n\x06SCREEN\x10\x01\x12\x0f\n\x0b\x46ORM_FACTOR\x10\x02\x12\t\n\x05\x41UDIO\x10\x03\x12\n\n\x06STYLUS\x10\x04\x12\x0c\n\x08KEYBOARD\x10\x05\x12\x0b\n\x07THERMAL\x10\x06\x12\n\n\x06\x43\x41MERA\x10\x07\x12(\n$ACCELEROMETER_GYROSCOPE_MAGNETOMETER\x10\x08\x12\x0f\n\x0b\x46INGERPRINT\x10\t\x12\x14\n\x10PROXIMITY_SENSOR\x10\n\x12\x12\n\x0e\x44\x41UGHTER_BOARD\x10\x0b\x12\x18\n\x14NON_VOLATILE_STORAGE\x10\x0c\x12\x07\n\x03RAM\x10\r\x12\x08\n\x04WIFI\x10\x0e\x12\r\n\tLTE_BOARD\x10\x0f\x12\r\n\tSD_READER\x10\x10\x12\x13\n\x0fMOTHERBOARD_USB\x10\x11\x12\r\n\tBLUETOOTH\x10\x12\x12\x0e\n\nBARRELJACK\x10\x13\x12\x10\n\x0cPOWER_BUTTON\x10\x14\x12\x11\n\rVOLUME_BUTTON\x10\x15\x12\x06\n\x02\x45\x43\x10\x16\x12\t\n\x05TOUCH\x10\x17\"\xcf\x31\n\x10HardwareFeatures\x12;\n\x05usb_c\x18\x01 \x01(\x0b\x32,.chromiumos.config.api.HardwareFeatures.UsbC\x12;\n\x05usb_a\x18\x02 \x01(\x0b\x32,.chromiumos.config.api.HardwareFeatures.UsbA\x12\x38\n\x03lte\x18\x03 \x01(\x0b\x32+.chromiumos.config.api.HardwareFeatures.Lte\x12:\n\x04hdmi\x18\x04 \x01(\x0b\x32,.chromiumos.config.api.HardwareFeatures.Hdmi\x12P\n\tfw_config\x18\x05 \x01(\x0b\x32=.chromiumos.config.api.HardwareFeatures.FirmwareConfiguration\x12<\n\x05\x61udio\x18\x06 \x01(\x0b\x32-.chromiumos.config.api.HardwareFeatures.Audio\x12>\n\x06\x63\x61mera\x18\x07 \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Camera\x12L\n\raccelerometer\x18\x08 \x01(\x0b\x32\x35.chromiumos.config.api.HardwareFeatures.Accelerometer\x12\x44\n\tgyroscope\x18\t \x01(\x0b\x32\x31.chromiumos.config.api.HardwareFeatures.Gyroscope\x12J\n\x0cmagnetometer\x18\n \x01(\x0b\x32\x34.chromiumos.config.api.HardwareFeatures.Magnetometer\x12I\n\x0clight_sensor\x18\x0b \x01(\x0b\x32\x33.chromiumos.config.api.HardwareFeatures.LightSensor\x12>\n\x06screen\x18\x0c \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Screen\x12G\n\x0b\x66orm_factor\x18\r \x01(\x0b\x32\x32.chromiumos.config.api.HardwareFeatures.FormFactor\x12>\n\x06stylus\x18\x0e \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Stylus\x12\x42\n\x08keyboard\x18\x0f \x01(\x0b\x32\x30.chromiumos.config.api.HardwareFeatures.Keyboard\x12>\n\x06memory\x18\x10 \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Memory\x12H\n\x0b\x66ingerprint\x18\x11 \x01(\x0b\x32\x33.chromiumos.config.api.HardwareFeatures.Fingerprint\x12@\n\x07storage\x18\x12 \x01(\x0b\x32/.chromiumos.config.api.HardwareFeatures.Storage\x12\x44\n\tbluetooth\x18\x13 \x01(\x0b\x32\x31.chromiumos.config.api.HardwareFeatures.Bluetooth\x12\x46\n\nbarreljack\x18\x14 \x01(\x0b\x32\x32.chromiumos.config.api.HardwareFeatures.BarrelJack\x12:\n\x04wifi\x18\x17 \x01(\x0b\x32,.chromiumos.config.api.HardwareFeatures.Wifi\x12\x44\n\x0cpower_button\x18\x15 \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Button\x12\x45\n\rvolume_button\x18\x16 \x01(\x0b\x32..chromiumos.config.api.HardwareFeatures.Button\x12W\n\x13\x65mbedded_controller\x18\x18 \x01(\x0b\x32:.chromiumos.config.api.HardwareFeatures.EmbeddedController\x1a\x16\n\x05\x43ount\x12\r\n\x05value\x18\x01 \x01(\r\x1a\x44\n\x04UsbC\x12<\n\x05\x63ount\x18\x01 \x01(\x0b\x32-.chromiumos.config.api.HardwareFeatures.Count\x1a\x44\n\x04UsbA\x12<\n\x05\x63ount\x18\x01 \x01(\x0b\x32-.chromiumos.config.api.HardwareFeatures.Count\x1aG\n\x03Lte\x12@\n\x07present\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1aH\n\x04Hdmi\x12@\n\x07present\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\x34\n\x15\x46irmwareConfiguration\x12\r\n\x05value\x18\x01 \x01(\r\x12\x0c\n\x04mask\x18\x02 \x01(\r\x1a\x96\x03\n\x05\x41udio\x12M\n\x0b\x61udio_codec\x18\x01 \x01(\x0e\x32\x38.chromiumos.config.api.HardwareFeatures.Audio.AudioCodec\x12M\n\x0bspeaker_amp\x18\x02 \x01(\x0e\x32\x38.chromiumos.config.api.HardwareFeatures.Audio.AudioCodec\x12Q\n\x0fheadphone_codec\x18\x03 \x01(\x0e\x32\x38.chromiumos.config.api.HardwareFeatures.Audio.AudioCodec\"\x9b\x01\n\nAudioCodec\x12\x17\n\x13\x41UDIO_CODEC_UNKNOWN\x10\x00\x12\n\n\x06RT5682\x10\x01\x12\x0c\n\x08\x41LC5682I\x10\x02\x12\x0b\n\x07\x41LC5682\x10\x03\x12\x0c\n\x08MAX98357\x10\x04\x12\x0c\n\x08MAX98373\x10\x05\x12\x0c\n\x08MAX98360\x10\x06\x12\n\n\x06RT1015\x10\x07\x12\n\n\x06\x44\x41\x37\x32\x31\x39\x10\x08\x12\x0b\n\x07\x41LC1011\x10\t\x1a\xf9\x05\n\x06\x43\x61mera\x12\x46\n\x07\x64\x65vices\x18\x04 \x03(\x0b\x32\x35.chromiumos.config.api.HardwareFeatures.Camera.Device\x1a\xd2\x02\n\x06\x44\x65vice\x12K\n\tinterface\x18\x02 \x01(\x0e\x32\x38.chromiumos.config.api.HardwareFeatures.Camera.Interface\x12\x45\n\x06\x66\x61\x63ing\x18\x03 \x01(\x0e\x32\x35.chromiumos.config.api.HardwareFeatures.Camera.Facing\x12O\n\x0borientation\x18\x04 \x01(\x0e\x32:.chromiumos.config.api.HardwareFeatures.Camera.Orientation\x12\r\n\x05\x66lags\x18\x05 \x01(\r\x12\x0b\n\x03ids\x18\x06 \x03(\t\x12G\n\x0eprivacy_switch\x18\x07 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\"I\n\tInterface\x12\x15\n\x11INTERFACE_UNKNOWN\x10\x00\x12\x11\n\rINTERFACE_USB\x10\x01\x12\x12\n\x0eINTERFACE_MIPI\x10\x02\"?\n\x06\x46\x61\x63ing\x12\x12\n\x0e\x46\x41\x43ING_UNKNOWN\x10\x00\x12\x10\n\x0c\x46\x41\x43ING_FRONT\x10\x01\x12\x0f\n\x0b\x46\x41\x43ING_BACK\x10\x02\"w\n\x0bOrientation\x12\x17\n\x13ORIENTATION_UNKNOWN\x10\x00\x12\x11\n\rORIENTATION_0\x10\x01\x12\x12\n\x0eORIENTATION_90\x10\x02\x12\x13\n\x0fORIENTATION_180\x10\x03\x12\x13\n\x0fORIENTATION_270\x10\x04\"M\n\x05\x46lags\x12\x0e\n\nFLAGS_NONE\x10\x00\x12\x17\n\x13\x46LAGS_SUPPORT_1080P\x10\x01\x12\x1b\n\x17\x46LAGS_SUPPORT_AUTOFOCUS\x10\x02\x1a\xa8\x01\n\rAccelerometer\x12J\n\x11lid_accelerometer\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12K\n\x12\x62\x61se_accelerometer\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\x9c\x01\n\tGyroscope\x12\x46\n\rlid_gyroscope\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12G\n\x0e\x62\x61se_gyroscope\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\xa5\x01\n\x0cMagnetometer\x12I\n\x10lid_magnetometer\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12J\n\x11\x62\x61se_magnetometer\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\xa2\x01\n\x0bLightSensor\x12H\n\x0flid_lightsensor\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12I\n\x10\x62\x61se_lightsensor\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\xaa\x01\n\x06Screen\x12R\n\x10panel_properties\x18\x03 \x01(\x0b\x32\x38.chromiumos.config.api.Component.DisplayPanel.Properties\x12\x46\n\rtouch_support\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.PresentJ\x04\x08\x01\x10\x02\x1a\xff\x01\n\nFormFactor\x12V\n\x0b\x66orm_factor\x18\x01 \x01(\x0e\x32\x41.chromiumos.config.api.HardwareFeatures.FormFactor.FormFactorType\"\x98\x01\n\x0e\x46ormFactorType\x12\x17\n\x13\x46ORM_FACTOR_UNKNOWN\x10\x00\x12\r\n\tCLAMSHELL\x10\x01\x12\x0f\n\x0b\x43ONVERTIBLE\x10\x02\x12\x0e\n\nDETACHABLE\x10\x03\x12\x0e\n\nCHROMEBASE\x10\x04\x12\r\n\tCHROMEBOX\x10\x05\x12\r\n\tCHROMEBIT\x10\x06\x12\x0f\n\x0b\x43HROMESLATE\x10\x07\x1a\x9b\x01\n\x06Stylus\x12I\n\x06stylus\x18\x01 \x01(\x0e\x32\x39.chromiumos.config.api.HardwareFeatures.Stylus.StylusType\"F\n\nStylusType\x12\x12\n\x0eSTYLUS_UNKNOWN\x10\x00\x12\x08\n\x04NONE\x10\x01\x12\x0c\n\x08INTERNAL\x10\x02\x12\x0c\n\x08\x45XTERNAL\x10\x03\x1a\xbe\x02\n\x08Keyboard\x12T\n\rkeyboard_type\x18\x01 \x01(\x0e\x32=.chromiumos.config.api.HardwareFeatures.Keyboard.KeyboardType\x12\x42\n\tbacklight\x18\x02 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12\x45\n\x0cpower_button\x18\x03 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\"Q\n\x0cKeyboardType\x12\x19\n\x15KEYBOARD_TYPE_UNKNOWN\x10\x00\x12\x0c\n\x08INTERNAL\x10\x01\x12\x08\n\x04NONE\x10\x02\x12\x0e\n\nDETACHABLE\x10\x03\x1aJ\n\x06Memory\x12@\n\x07profile\x18\x01 \x01(\x0b\x32/.chromiumos.config.api.Component.Memory.Profile\x1a\xb9\x02\n\x0b\x46ingerprint\x12N\n\x08location\x18\x01 \x01(\x0e\x32<.chromiumos.config.api.HardwareFeatures.Fingerprint.Location\x12\r\n\x05\x62oard\x18\x02 \x01(\t\x12\x12\n\nro_version\x18\x03 \x01(\t\"\xb6\x01\n\x08Location\x12\x14\n\x10LOCATION_UNKNOWN\x10\x00\x12\x19\n\x15POWER_BUTTON_TOP_LEFT\x10\x01\x12\x18\n\x14KEYBOARD_BOTTOM_LEFT\x10\x02\x12\x19\n\x15KEYBOARD_BOTTOM_RIGHT\x10\x03\x12\x16\n\x12KEYBOARD_TOP_RIGHT\x10\x04\x12\x0f\n\x0bNOT_PRESENT\x10\x05\x12\x1b\n\x17POWER_BUTTON_SIDE_RIGHT\x10\x06\x1aU\n\x07Storage\x12J\n\x0cstorage_type\x18\x01 \x01(\x0e\x32\x34.chromiumos.config.api.Component.Storage.StorageType\x1aJ\n\tBluetooth\x12=\n\tcomponent\x18\x01 \x01(\x0b\x32*.chromiumos.config.api.Component.Bluetooth\x1aN\n\nBarrelJack\x12@\n\x07present\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x1a\xf7\x01\n\x04Wifi\x12T\n\x18supported_wlan_protocols\x18\x01 \x03(\x0e\x32\x32.chromiumos.config.api.Component.Wifi.WLANProtocol\x12I\n\nwifi_chips\x18\x02 \x03(\x0e\x32\x35.chromiumos.config.api.HardwareFeatures.Wifi.WifiChip\"N\n\x08WifiChip\x12\x15\n\x11WIFI_CHIP_UNKNOWN\x10\x00\x12\x15\n\x11WIRELESS_86ED801D\x10\x01\x12\x14\n\x10WIRELESS_REALTEK\x10\x02\x1a\xa0\x02\n\x06\x42utton\x12\x45\n\x06region\x18\x01 \x01(\x0e\x32\x35.chromiumos.config.api.HardwareFeatures.Button.Region\x12\x41\n\x04\x65\x64ge\x18\x02 \x01(\x0e\x32\x33.chromiumos.config.api.HardwareFeatures.Button.Edge\x12\x10\n\x08position\x18\x03 \x01(\x02\"6\n\x06Region\x12\x12\n\x0eREGION_UNKNOWN\x10\x00\x12\n\n\x06SCREEN\x10\x01\x12\x0c\n\x08KEYBOARD\x10\x02\"B\n\x04\x45\x64ge\x12\x10\n\x0c\x45\x44GE_UNKNOWN\x10\x00\x12\x08\n\x04LEFT\x10\x01\x12\t\n\x05RIGHT\x10\x02\x12\x07\n\x03TOP\x10\x03\x12\n\n\x06\x42OTTOM\x10\x04\x1a\xc9\x02\n\x12\x45mbeddedController\x12@\n\x07present\x18\x01 \x01(\x0e\x32/.chromiumos.config.api.HardwareFeatures.Present\x12\x62\n\x07\x65\x63_type\x18\x02 \x01(\x0e\x32Q.chromiumos.config.api.HardwareFeatures.EmbeddedController.EmbeddedControllerType\x12\x41\n\x04part\x18\x03 \x01(\x0b\x32\x33.chromiumos.config.api.Component.EmbeddedController\"J\n\x16\x45mbeddedControllerType\x12\x13\n\x0f\x45\x43_TYPE_UNKNOWN\x10\x00\x12\r\n\tEC_CHROME\x10\x01\x12\x0c\n\x08\x45\x43_WILCO\x10\x02\"<\n\x07Present\x12\x13\n\x0fPRESENT_UNKNOWN\x10\x00\x12\x0b\n\x07PRESENT\x10\x01\x12\x0f\n\x0bNOT_PRESENT\x10\x02\x42*Z(go.chromium.org/chromiumos/config/go/apib\x06proto3')
   ,
   dependencies=[chromiumos_dot_config_dot_api_dot_component__pb2.DESCRIPTOR,])
 
@@ -124,11 +124,15 @@
       name='EC', index=22, number=22,
       serialized_options=None,
       type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TOUCH', index=23, number=23,
+      serialized_options=None,
+      type=None),
   ],
   containing_type=None,
   serialized_options=None,
   serialized_start=370,
-  serialized_end=758,
+  serialized_end=769,
 )
 _sym_db.RegisterEnumDescriptor(_TOPOLOGY_TYPE)
 
@@ -181,8 +185,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=3050,
-  serialized_end=3205,
+  serialized_start=3061,
+  serialized_end=3216,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_AUDIO_AUDIOCODEC)
 
@@ -207,8 +211,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=3631,
-  serialized_end=3704,
+  serialized_start=3642,
+  serialized_end=3715,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_CAMERA_INTERFACE)
 
@@ -233,8 +237,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=3706,
-  serialized_end=3769,
+  serialized_start=3717,
+  serialized_end=3780,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_CAMERA_FACING)
 
@@ -267,8 +271,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=3771,
-  serialized_end=3890,
+  serialized_start=3782,
+  serialized_end=3901,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_CAMERA_ORIENTATION)
 
@@ -293,8 +297,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=3892,
-  serialized_end=3969,
+  serialized_start=3903,
+  serialized_end=3980,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_CAMERA_FLAGS)
 
@@ -339,8 +343,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=4911,
-  serialized_end=5063,
+  serialized_start=4922,
+  serialized_end=5074,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_FORMFACTOR_FORMFACTORTYPE)
 
@@ -369,8 +373,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=5151,
-  serialized_end=5221,
+  serialized_start=5162,
+  serialized_end=5232,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_STYLUS_STYLUSTYPE)
 
@@ -399,8 +403,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=5461,
-  serialized_end=5542,
+  serialized_start=5472,
+  serialized_end=5553,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_KEYBOARD_KEYBOARDTYPE)
 
@@ -441,8 +445,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=5752,
-  serialized_end=5934,
+  serialized_start=5763,
+  serialized_end=5945,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_FINGERPRINT_LOCATION)
 
@@ -467,8 +471,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=6349,
-  serialized_end=6427,
+  serialized_start=6360,
+  serialized_end=6438,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_WIFI_WIFICHIP)
 
@@ -493,8 +497,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=6596,
-  serialized_end=6650,
+  serialized_start=6607,
+  serialized_end=6661,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_BUTTON_REGION)
 
@@ -527,8 +531,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=6652,
-  serialized_end=6718,
+  serialized_start=6663,
+  serialized_end=6729,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_BUTTON_EDGE)
 
@@ -553,8 +557,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=6976,
-  serialized_end=7050,
+  serialized_start=6987,
+  serialized_end=7061,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_EMBEDDEDCONTROLLER_EMBEDDEDCONTROLLERTYPE)
 
@@ -579,8 +583,8 @@
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=7052,
-  serialized_end=7112,
+  serialized_start=7063,
+  serialized_end=7123,
 )
 _sym_db.RegisterEnumDescriptor(_HARDWAREFEATURES_PRESENT)
 
@@ -671,7 +675,7 @@
   oneofs=[
   ],
   serialized_start=103,
-  serialized_end=758,
+  serialized_end=769,
 )
 
 
@@ -701,8 +705,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2433,
-  serialized_end=2455,
+  serialized_start=2444,
+  serialized_end=2466,
 )
 
 _HARDWAREFEATURES_USBC = _descriptor.Descriptor(
@@ -731,8 +735,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2457,
-  serialized_end=2525,
+  serialized_start=2468,
+  serialized_end=2536,
 )
 
 _HARDWAREFEATURES_USBA = _descriptor.Descriptor(
@@ -761,8 +765,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2527,
-  serialized_end=2595,
+  serialized_start=2538,
+  serialized_end=2606,
 )
 
 _HARDWAREFEATURES_LTE = _descriptor.Descriptor(
@@ -791,8 +795,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2597,
-  serialized_end=2668,
+  serialized_start=2608,
+  serialized_end=2679,
 )
 
 _HARDWAREFEATURES_HDMI = _descriptor.Descriptor(
@@ -821,8 +825,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2670,
-  serialized_end=2742,
+  serialized_start=2681,
+  serialized_end=2753,
 )
 
 _HARDWAREFEATURES_FIRMWARECONFIGURATION = _descriptor.Descriptor(
@@ -858,8 +862,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2744,
-  serialized_end=2796,
+  serialized_start=2755,
+  serialized_end=2807,
 )
 
 _HARDWAREFEATURES_AUDIO = _descriptor.Descriptor(
@@ -903,8 +907,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2799,
-  serialized_end=3205,
+  serialized_start=2810,
+  serialized_end=3216,
 )
 
 _HARDWAREFEATURES_CAMERA_DEVICE = _descriptor.Descriptor(
@@ -968,8 +972,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3291,
-  serialized_end=3629,
+  serialized_start=3302,
+  serialized_end=3640,
 )
 
 _HARDWAREFEATURES_CAMERA = _descriptor.Descriptor(
@@ -1002,8 +1006,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3208,
-  serialized_end=3969,
+  serialized_start=3219,
+  serialized_end=3980,
 )
 
 _HARDWAREFEATURES_ACCELEROMETER = _descriptor.Descriptor(
@@ -1039,8 +1043,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3972,
-  serialized_end=4140,
+  serialized_start=3983,
+  serialized_end=4151,
 )
 
 _HARDWAREFEATURES_GYROSCOPE = _descriptor.Descriptor(
@@ -1076,8 +1080,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4143,
-  serialized_end=4299,
+  serialized_start=4154,
+  serialized_end=4310,
 )
 
 _HARDWAREFEATURES_MAGNETOMETER = _descriptor.Descriptor(
@@ -1113,8 +1117,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4302,
-  serialized_end=4467,
+  serialized_start=4313,
+  serialized_end=4478,
 )
 
 _HARDWAREFEATURES_LIGHTSENSOR = _descriptor.Descriptor(
@@ -1150,8 +1154,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4470,
-  serialized_end=4632,
+  serialized_start=4481,
+  serialized_end=4643,
 )
 
 _HARDWAREFEATURES_SCREEN = _descriptor.Descriptor(
@@ -1187,8 +1191,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4635,
-  serialized_end=4805,
+  serialized_start=4646,
+  serialized_end=4816,
 )
 
 _HARDWAREFEATURES_FORMFACTOR = _descriptor.Descriptor(
@@ -1218,8 +1222,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4808,
-  serialized_end=5063,
+  serialized_start=4819,
+  serialized_end=5074,
 )
 
 _HARDWAREFEATURES_STYLUS = _descriptor.Descriptor(
@@ -1249,8 +1253,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5066,
-  serialized_end=5221,
+  serialized_start=5077,
+  serialized_end=5232,
 )
 
 _HARDWAREFEATURES_KEYBOARD = _descriptor.Descriptor(
@@ -1294,8 +1298,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5224,
-  serialized_end=5542,
+  serialized_start=5235,
+  serialized_end=5553,
 )
 
 _HARDWAREFEATURES_MEMORY = _descriptor.Descriptor(
@@ -1324,8 +1328,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5544,
-  serialized_end=5618,
+  serialized_start=5555,
+  serialized_end=5629,
 )
 
 _HARDWAREFEATURES_FINGERPRINT = _descriptor.Descriptor(
@@ -1369,8 +1373,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5621,
-  serialized_end=5934,
+  serialized_start=5632,
+  serialized_end=5945,
 )
 
 _HARDWAREFEATURES_STORAGE = _descriptor.Descriptor(
@@ -1399,8 +1403,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5936,
-  serialized_end=6021,
+  serialized_start=5947,
+  serialized_end=6032,
 )
 
 _HARDWAREFEATURES_BLUETOOTH = _descriptor.Descriptor(
@@ -1429,8 +1433,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6023,
-  serialized_end=6097,
+  serialized_start=6034,
+  serialized_end=6108,
 )
 
 _HARDWAREFEATURES_BARRELJACK = _descriptor.Descriptor(
@@ -1459,8 +1463,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6099,
-  serialized_end=6177,
+  serialized_start=6110,
+  serialized_end=6188,
 )
 
 _HARDWAREFEATURES_WIFI = _descriptor.Descriptor(
@@ -1497,8 +1501,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6180,
-  serialized_end=6427,
+  serialized_start=6191,
+  serialized_end=6438,
 )
 
 _HARDWAREFEATURES_BUTTON = _descriptor.Descriptor(
@@ -1543,8 +1547,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6430,
-  serialized_end=6718,
+  serialized_start=6441,
+  serialized_end=6729,
 )
 
 _HARDWAREFEATURES_EMBEDDEDCONTROLLER = _descriptor.Descriptor(
@@ -1588,8 +1592,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6721,
-  serialized_end=7050,
+  serialized_start=6732,
+  serialized_end=7061,
 )
 
 _HARDWAREFEATURES = _descriptor.Descriptor(
@@ -1780,8 +1784,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=761,
-  serialized_end=7112,
+  serialized_start=772,
+  serialized_end=7123,
 )
 
 _TOPOLOGY_DESCRIPTIONENTRY.containing_type = _TOPOLOGY
diff --git a/test/program/fake/generated/config.jsonproto b/test/program/fake/generated/config.jsonproto
index 5567b85..59a7c5f 100644
--- a/test/program/fake/generated/config.jsonproto
+++ b/test/program/fake/generated/config.jsonproto
@@ -132,6 +132,10 @@
         {
           "mask": 61440,
           "name": "Intel wifi sar id"
+        },
+        {
+          "mask": 65536,
+          "name": "Touch controller"
         }
       ],
       "id": {
diff --git a/test/program/fake/program.star b/test/program/fake/program.star
index 5fcb78f..3318847 100644
--- a/test/program/fake/program.star
+++ b/test/program/fake/program.star
@@ -32,6 +32,7 @@
     CAMERA = 0x000000F0,
     SENSOR = 0x00000F00,
     WIFI_SAR_ID = 0x0000F000,
+    TOUCH = 0x00010000,
 )
 
 _FIRMWARE_CONFIGURATION_SEGMENTS = [
@@ -39,6 +40,7 @@
     program_util.create_firmware_configuration_segment("Camera", _FW_MASKS.CAMERA),
     program_util.create_firmware_configuration_segment("Sensor", _FW_MASKS.SENSOR),
     program_util.create_firmware_configuration_segment("Intel wifi sar id", _FW_MASKS.WIFI_SAR_ID),
+    program_util.create_firmware_configuration_segment("Touch controller", _FW_MASKS.TOUCH),
 ]
 
 _FEATURE_CONSTRAINTS = design.create_constraints(
diff --git a/test/project/fake/fake/config.star b/test/project/fake/fake/config.star
index 23f0527..ad1bf7b 100755
--- a/test/project/fake/fake/config.star
+++ b/test/project/fake/fake/config.star
@@ -131,6 +131,8 @@
     },
 )
 
+_TOUCH = hw_topo.create_touch("TOUCH", "Numpad touch", fw_configs = [hw_topo.make_fw_config(program.fw_masks.TOUCH, 1)])
+
 def create_hardware_topology(
         screen = None,
         form_factor = None,
@@ -166,6 +168,7 @@
         power_button = _POWER_BUTTON,
         volume_button = _VOLUME_BUTTON,
         ec = hw_topo.EC_CHROME,
+        touch = _TOUCH,
     )
 
 # Create empty arrays that we will continually append new configurations to
diff --git a/test/project/fake/fake/factory/generated/model_sku.json b/test/project/fake/fake/factory/generated/model_sku.json
index 2d16262..ffb8511 100644
--- a/test/project/fake/fake/factory/generated/model_sku.json
+++ b/test/project/fake/fake/factory/generated/model_sku.json
@@ -72,7 +72,7 @@
         ]
       ],
       "component.speaker_amp": "MAX98373",
-      "fw_config": 25377
+      "fw_config": 90913
     },
     "project_b": {
       "component.audio_card_name": "fakeaudiocard",
@@ -122,7 +122,7 @@
         ]
       ],
       "component.speaker_amp": "MAX98373",
-      "fw_config": 25376
+      "fw_config": 90912
     },
     "project_box": {
       "component.audio_card_name": "fakeaudiocard",
@@ -172,7 +172,7 @@
         ]
       ],
       "component.speaker_amp": "MAX98373",
-      "fw_config": 25345
+      "fw_config": 90881
     },
     "project_c": {
       "component.audio_card_name": "fakeaudiocard",
@@ -222,7 +222,7 @@
         ]
       ],
       "component.speaker_amp": "MAX98373",
-      "fw_config": 25377
+      "fw_config": 90913
     },
     "project_wl": {
       "component.audio_card_name": "fakeaudiocard",
@@ -272,7 +272,7 @@
         ]
       ],
       "component.speaker_amp": "MAX98373",
-      "fw_config": 25377
+      "fw_config": 90913
     }
   },
   "product_sku": {
@@ -303,7 +303,7 @@
             1
           ]
         ],
-        "fw_config": 25344
+        "fw_config": 90880
       },
       "2147483647": {
         "component.fingerprint_board": "fake_fingerprint_board",
@@ -331,7 +331,7 @@
             1
           ]
         ],
-        "fw_config": 25377
+        "fw_config": 90913
       }
     },
     "PROJECT_A": {
diff --git a/test/project/fake/fake/generated/config.jsonproto b/test/project/fake/fake/generated/config.jsonproto
index d05c252..bd6a92b 100644
--- a/test/project/fake/fake/generated/config.jsonproto
+++ b/test/project/fake/fake/generated/config.jsonproto
@@ -185,8 +185,8 @@
               "formFactor": 1
             },
             "fwConfig": {
-              "mask": 65535,
-              "value": 25377
+              "mask": 131071,
+              "value": 90913
             },
             "gyroscope": {
               "baseGyroscope": 1
@@ -515,6 +515,19 @@
               "id": "THERMAL",
               "type": 6
             },
+            "touch": {
+              "description": {
+                "EN": "Numpad touch"
+              },
+              "hardwareFeature": {
+                "fwConfig": {
+                  "mask": 65536,
+                  "value": 65536
+                }
+              },
+              "id": "TOUCH",
+              "type": 23
+            },
             "volumeButton": {
               "description": {
                 "EN": "Volume button on the right edge of the screen"
@@ -589,8 +602,8 @@
               "formFactor": 1
             },
             "fwConfig": {
-              "mask": 65535,
-              "value": 25344
+              "mask": 131071,
+              "value": 90880
             },
             "gyroscope": {
               "baseGyroscope": 1
@@ -891,6 +904,19 @@
               "id": "THERMAL",
               "type": 6
             },
+            "touch": {
+              "description": {
+                "EN": "Numpad touch"
+              },
+              "hardwareFeature": {
+                "fwConfig": {
+                  "mask": 65536,
+                  "value": 65536
+                }
+              },
+              "id": "TOUCH",
+              "type": 23
+            },
             "volumeButton": {
               "description": {
                 "EN": "Volume button on the right edge of the screen"
@@ -981,8 +1007,8 @@
               "formFactor": 2
             },
             "fwConfig": {
-              "mask": 65535,
-              "value": 25377
+              "mask": 131071,
+              "value": 90913
             },
             "gyroscope": {
               "baseGyroscope": 1
@@ -1293,6 +1319,19 @@
               "id": "THERMAL",
               "type": 6
             },
+            "touch": {
+              "description": {
+                "EN": "Numpad touch"
+              },
+              "hardwareFeature": {
+                "fwConfig": {
+                  "mask": 65536,
+                  "value": 65536
+                }
+              },
+              "id": "TOUCH",
+              "type": 23
+            },
             "volumeButton": {
               "description": {
                 "EN": "Volume button on the right edge of the screen"
@@ -1382,8 +1421,8 @@
               "formFactor": 2
             },
             "fwConfig": {
-              "mask": 65535,
-              "value": 25376
+              "mask": 131071,
+              "value": 90912
             },
             "gyroscope": {
               "baseGyroscope": 1
@@ -1680,6 +1719,19 @@
               "id": "THERMAL",
               "type": 6
             },
+            "touch": {
+              "description": {
+                "EN": "Numpad touch"
+              },
+              "hardwareFeature": {
+                "fwConfig": {
+                  "mask": 65536,
+                  "value": 65536
+                }
+              },
+              "id": "TOUCH",
+              "type": 23
+            },
             "volumeButton": {
               "description": {
                 "EN": "Volume button on the right edge of the screen"
@@ -1769,8 +1821,8 @@
               "formFactor": 1
             },
             "fwConfig": {
-              "mask": 65535,
-              "value": 25377
+              "mask": 131071,
+              "value": 90913
             },
             "gyroscope": {
               "baseGyroscope": 1
@@ -2068,6 +2120,19 @@
               "id": "THERMAL",
               "type": 6
             },
+            "touch": {
+              "description": {
+                "EN": "Numpad touch"
+              },
+              "hardwareFeature": {
+                "fwConfig": {
+                  "mask": 65536,
+                  "value": 65536
+                }
+              },
+              "id": "TOUCH",
+              "type": 23
+            },
             "volumeButton": {
               "description": {
                 "EN": "Volume button on the right edge of the screen"
@@ -2148,8 +2213,8 @@
               "formFactor": 1
             },
             "fwConfig": {
-              "mask": 65535,
-              "value": 25377
+              "mask": 131071,
+              "value": 90913
             },
             "gyroscope": {
               "baseGyroscope": 1
@@ -2414,6 +2479,19 @@
               "id": "THERMAL",
               "type": 6
             },
+            "touch": {
+              "description": {
+                "EN": "Numpad touch"
+              },
+              "hardwareFeature": {
+                "fwConfig": {
+                  "mask": 65536,
+                  "value": 65536
+                }
+              },
+              "id": "TOUCH",
+              "type": 23
+            },
             "volumeButton": {
               "description": {
                 "EN": "Volume button on the right edge of the screen"
@@ -2482,8 +2560,8 @@
               "formFactor": 5
             },
             "fwConfig": {
-              "mask": 65295,
-              "value": 25345
+              "mask": 130831,
+              "value": 90881
             },
             "gyroscope": {
               "baseGyroscope": 1
@@ -2723,6 +2801,19 @@
               "id": "THERMAL",
               "type": 6
             },
+            "touch": {
+              "description": {
+                "EN": "Numpad touch"
+              },
+              "hardwareFeature": {
+                "fwConfig": {
+                  "mask": 65536,
+                  "value": 65536
+                }
+              },
+              "id": "TOUCH",
+              "type": 23
+            },
             "volumeButton": {
               "description": {
                 "EN": "Volume button on the right edge of the screen"
diff --git a/test/project/fake/fake/sw_build_config/platform/chromeos-config/generated/project-config.json b/test/project/fake/fake/sw_build_config/platform/chromeos-config/generated/project-config.json
index 64dd1b8..8add95b 100644
--- a/test/project/fake/fake/sw_build_config/platform/chromeos-config/generated/project-config.json
+++ b/test/project/fake/fake/sw_build_config/platform/chromeos-config/generated/project-config.json
@@ -79,7 +79,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -257,7 +257,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25344,
+          "firmware-config": 90880,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -454,7 +454,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -616,7 +616,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25376,
+          "firmware-config": 90912,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -766,7 +766,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -916,7 +916,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -1067,7 +1067,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -1219,7 +1219,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -1371,7 +1371,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25377,
+          "firmware-config": 90913,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
@@ -1501,7 +1501,7 @@
             "libpayload": "fake"
           },
           "ec-ro-image": "bcs://Fake_EC.11111.2.0.tbz2",
-          "firmware-config": 25345,
+          "firmware-config": 90881,
           "image-name": "fake",
           "main-ro-image": "bcs://Fake.11111.0.0.tbz2",
           "main-rw-image": "bcs://Fake.11111.0.0.tbz2",
diff --git a/util/hw_topology.star b/util/hw_topology.star
index a4e14bb..870a527 100644
--- a/util/hw_topology.star
+++ b/util/hw_topology.star
@@ -713,6 +713,19 @@
 _EC_CHROME = _create_ec(ec_type = _EC_TYPE.CHROME)
 _EC_WILCO = _create_ec(ec_type = _EC_TYPE.WILCO)
 
+def _create_touch(id, description, fw_configs = []):
+    """Builds a Topology proto for touch."""
+    hw_features = topo_pb.HardwareFeatures()
+
+    _accumulate_fw_configs(hw_features, fw_configs)
+
+    return topo_pb.Topology(
+        id = id,
+        type = topo_pb.Topology.TOUCH,
+        description = {"EN": description},
+        hardware_feature = hw_features,
+    )
+
 def _create_hardware_topology(
         screen = None,
         form_factor = None,
@@ -734,7 +747,8 @@
         barreljack = None,
         power_button = None,
         volume_button = None,
-        ec = None):
+        ec = None,
+        touch = None):
     """Builds a HardwareTopology proto from Topology protos."""
 
     # Only allow form_factor topologies for form factors
@@ -801,6 +815,9 @@
     if ec and ec.type != topo_pb.Topology.EC:
         fail("Invalid ec type")
 
+    if touch and touch.type != topo_pb.Topology.TOUCH:
+        fail("Invalid touch topology")
+
     return hw_topo_pb.HardwareTopology(
         screen = screen,
         form_factor = form_factor,
@@ -823,6 +840,7 @@
         power_button = power_button,
         volume_button = volume_button,
         ec = ec,
+        touch = touch,
     )
 
 def _accumulate_presence(existing_present, new_present):
@@ -975,6 +993,9 @@
     if copy.volume_button.hardware_feature.volume_button != topo_pb.HardwareFeatures.Button():
         result.volume_button = copy.volume_button.hardware_feature.volume_button
 
+    # Handle all possible touch hardware features
+    _accumulate_fw_config(result.fw_config, copy.touch.hardware_feature.fw_config)
+
     return result
 
 hw_topo = struct(
@@ -1001,6 +1022,7 @@
     create_hardware_topology = _create_hardware_topology,
     create_power_button = _create_power_button,
     create_volume_button = _create_volume_button,
+    create_touch = _create_touch,
     convert_to_hw_features = _convert_to_hw_features,
     make_camera_device = _make_camera_device,
     make_fw_config = _make_fw_config,