diff --git a/googleapis/chromeos/uidetection/v1/ui_detection.pb.go b/googleapis/chromeos/uidetection/v1/ui_detection.pb.go
index 501cf4978..9d934674d 100644
--- a/googleapis/chromeos/uidetection/v1/ui_detection.pb.go
+++ b/googleapis/chromeos/uidetection/v1/ui_detection.pb.go
@@ -52,9 +52,12 @@ type UiDetectionRequest struct {
 	Request *DetectionRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	// Indicates whether to resize the image when detecting.
 	ResizeImage *bool `protobuf:"varint,3,opt,name=resize_image,json=resizeImage,proto3,oneof" json:"resize_image,omitempty"`
-	// Name of the calling test, as it should appear in analytics. For example,
-	// 'tast.uidetection.BasicDetections'.
+	// Deprecated as of 2023-03-29. Use test_metadata instead.
+	//
+	// Deprecated: Do not use.
 	TestId string `protobuf:"bytes,4,opt,name=test_id,json=testId,proto3" json:"test_id,omitempty"`
+	// Optional. Metadata about the client for analytics.
+	TestMetadata *TestMetadata `protobuf:"bytes,5,opt,name=test_metadata,json=testMetadata,proto3" json:"test_metadata,omitempty"`
 }
 
 func (x *UiDetectionRequest) Reset() {
@@ -110,6 +113,7 @@ func (x *UiDetectionRequest) GetResizeImage() bool {
 	return false
 }
 
+// Deprecated: Do not use.
 func (x *UiDetectionRequest) GetTestId() string {
 	if x != nil {
 		return x.TestId
@@ -117,6 +121,13 @@ func (x *UiDetectionRequest) GetTestId() string {
 	return ""
 }
 
+func (x *UiDetectionRequest) GetTestMetadata() *TestMetadata {
+	if x != nil {
+		return x.TestMetadata
+	}
+	return nil
+}
+
 // Detection type specifies what to detect in the image.
 type DetectionRequest struct {
 	state         protoimpl.MessageState
@@ -216,6 +227,83 @@ func (*DetectionRequest_TextBlockDetectionRequest) isDetectionRequest_DetectionR
 
 func (*DetectionRequest_CustomIconDetectionRequest) isDetectionRequest_DetectionRequestType() {}
 
+// Metadata about the client test and test device.
+type TestMetadata struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Name of the calling test. For example, 'tast.uidetection.BasicDetections'.
+	TestId string `protobuf:"bytes,1,opt,name=test_id,json=testId,proto3" json:"test_id,omitempty"`
+	// Board name of the ChromeOS device under test. For example, 'volteer'.
+	Board string `protobuf:"bytes,2,opt,name=board,proto3" json:"board,omitempty"`
+	// Model name of the ChromeOS device under test. For example, 'volet'.
+	Model string `protobuf:"bytes,3,opt,name=model,proto3" json:"model,omitempty"`
+	// ChromeOS build of the device under test.
+	// For example, 'volteer-release/R110-15275.0.0-75031-8794956681263330561'.
+	CrosBuild string `protobuf:"bytes,4,opt,name=cros_build,json=crosBuild,proto3" json:"cros_build,omitempty"`
+}
+
+func (x *TestMetadata) Reset() {
+	*x = TestMetadata{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TestMetadata) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TestMetadata) ProtoMessage() {}
+
+func (x *TestMetadata) ProtoReflect() protoreflect.Message {
+	mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TestMetadata.ProtoReflect.Descriptor instead.
+func (*TestMetadata) Descriptor() ([]byte, []int) {
+	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *TestMetadata) GetTestId() string {
+	if x != nil {
+		return x.TestId
+	}
+	return ""
+}
+
+func (x *TestMetadata) GetBoard() string {
+	if x != nil {
+		return x.Board
+	}
+	return ""
+}
+
+func (x *TestMetadata) GetModel() string {
+	if x != nil {
+		return x.Model
+	}
+	return ""
+}
+
+func (x *TestMetadata) GetCrosBuild() string {
+	if x != nil {
+		return x.CrosBuild
+	}
+	return ""
+}
+
 // Detection type for word detection.
 type WordDetectionRequest struct {
 	state         protoimpl.MessageState
@@ -236,7 +324,7 @@ type WordDetectionRequest struct {
 func (x *WordDetectionRequest) Reset() {
 	*x = WordDetectionRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[2]
+		mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -249,7 +337,7 @@ func (x *WordDetectionRequest) String() string {
 func (*WordDetectionRequest) ProtoMessage() {}
 
 func (x *WordDetectionRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[2]
+	mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -262,7 +350,7 @@ func (x *WordDetectionRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WordDetectionRequest.ProtoReflect.Descriptor instead.
 func (*WordDetectionRequest) Descriptor() ([]byte, []int) {
-	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP(), []int{2}
+	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *WordDetectionRequest) GetWord() string {
@@ -316,7 +404,7 @@ type TextBlockDetectionRequest struct {
 func (x *TextBlockDetectionRequest) Reset() {
 	*x = TextBlockDetectionRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[3]
+		mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -329,7 +417,7 @@ func (x *TextBlockDetectionRequest) String() string {
 func (*TextBlockDetectionRequest) ProtoMessage() {}
 
 func (x *TextBlockDetectionRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[3]
+	mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -342,7 +430,7 @@ func (x *TextBlockDetectionRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TextBlockDetectionRequest.ProtoReflect.Descriptor instead.
 func (*TextBlockDetectionRequest) Descriptor() ([]byte, []int) {
-	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP(), []int{3}
+	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *TextBlockDetectionRequest) GetWords() []string {
@@ -398,7 +486,7 @@ type CustomIconDetectionRequest struct {
 func (x *CustomIconDetectionRequest) Reset() {
 	*x = CustomIconDetectionRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[4]
+		mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -411,7 +499,7 @@ func (x *CustomIconDetectionRequest) String() string {
 func (*CustomIconDetectionRequest) ProtoMessage() {}
 
 func (x *CustomIconDetectionRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[4]
+	mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -424,7 +512,7 @@ func (x *CustomIconDetectionRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CustomIconDetectionRequest.ProtoReflect.Descriptor instead.
 func (*CustomIconDetectionRequest) Descriptor() ([]byte, []int) {
-	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP(), []int{4}
+	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *CustomIconDetectionRequest) GetIconPng() []byte {
@@ -464,7 +552,7 @@ type UiDetectionResponse struct {
 func (x *UiDetectionResponse) Reset() {
 	*x = UiDetectionResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[5]
+		mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -477,7 +565,7 @@ func (x *UiDetectionResponse) String() string {
 func (*UiDetectionResponse) ProtoMessage() {}
 
 func (x *UiDetectionResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[5]
+	mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -490,7 +578,7 @@ func (x *UiDetectionResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UiDetectionResponse.ProtoReflect.Descriptor instead.
 func (*UiDetectionResponse) Descriptor() ([]byte, []int) {
-	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP(), []int{5}
+	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *UiDetectionResponse) GetBoundingBoxes() []*BoundingBox {
@@ -530,7 +618,7 @@ type BoundingBox struct {
 func (x *BoundingBox) Reset() {
 	*x = BoundingBox{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[6]
+		mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -543,7 +631,7 @@ func (x *BoundingBox) String() string {
 func (*BoundingBox) ProtoMessage() {}
 
 func (x *BoundingBox) ProtoReflect() protoreflect.Message {
-	mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[6]
+	mi := &file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -556,7 +644,7 @@ func (x *BoundingBox) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BoundingBox.ProtoReflect.Descriptor instead.
 func (*BoundingBox) Descriptor() ([]byte, []int) {
-	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP(), []int{6}
+	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *BoundingBox) GetText() string {
@@ -607,7 +695,7 @@ var file_google_chromeos_uidetection_v1_ui_detection_proto_rawDesc = []byte{
 	0x6f, 0x1a, 0x17, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6c,
 	0x69, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67,
 	0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x62, 0x65, 0x68,
-	0x61, 0x76, 0x69, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd9, 0x01, 0x0a, 0x12,
+	0x61, 0x76, 0x69, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb5, 0x02, 0x0a, 0x12,
 	0x55, 0x69, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x12, 0x20, 0x0a, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6e, 0x67, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x08, 0x69, 0x6d, 0x61, 0x67,
@@ -618,36 +706,49 @@ var file_google_chromeos_uidetection_v1_ui_detection_proto_rawDesc = []byte{
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x07, 0x72, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0c, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x65, 0x5f,
 	0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0b, 0x72,
-	0x65, 0x73, 0x69, 0x7a, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a,
-	0x07, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x74, 0x65, 0x73, 0x74, 0x49, 0x64, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x72, 0x65, 0x73, 0x69, 0x7a,
-	0x65, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x99, 0x03, 0x0a, 0x10, 0x44, 0x65, 0x74, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x6c, 0x0a, 0x16,
-	0x77, 0x6f, 0x72, 0x64, 0x5f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x67,
+	0x65, 0x73, 0x69, 0x7a, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a,
+	0x07, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02,
+	0x18, 0x01, 0x52, 0x06, 0x74, 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x56, 0x0a, 0x0d, 0x74, 0x65,
+	0x73, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x68, 0x72, 0x6f, 0x6d,
+	0x65, 0x6f, 0x73, 0x2e, 0x75, 0x69, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
+	0x76, 0x31, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42,
+	0x03, 0xe0, 0x41, 0x01, 0x52, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x69, 0x6d,
+	0x61, 0x67, 0x65, 0x22, 0x99, 0x03, 0x0a, 0x10, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x6c, 0x0a, 0x16, 0x77, 0x6f, 0x72, 0x64,
+	0x5f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x6f, 0x73, 0x2e, 0x75, 0x69, 0x64, 0x65, 0x74,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x64, 0x44, 0x65,
+	0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00,
+	0x52, 0x14, 0x77, 0x6f, 0x72, 0x64, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x7c, 0x0a, 0x1c, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x62,
+	0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x67,
 	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x6f, 0x73, 0x2e, 0x75,
-	0x69, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x6f,
-	0x72, 0x64, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x48, 0x00, 0x52, 0x14, 0x77, 0x6f, 0x72, 0x64, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x7c, 0x0a, 0x1c, 0x74, 0x65,
-	0x78, 0x74, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x39, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65,
-	0x6f, 0x73, 0x2e, 0x75, 0x69, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76,
-	0x31, 0x2e, 0x54, 0x65, 0x78, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x44, 0x65, 0x74, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x19, 0x74,
-	0x65, 0x78, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x7f, 0x0a, 0x1d, 0x63, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x3a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x6f,
-	0x73, 0x2e, 0x75, 0x69, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
-	0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x49, 0x63, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x1a, 0x63,
-	0x75, 0x73, 0x74, 0x6f, 0x6d, 0x49, 0x63, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x18, 0x0a, 0x16, 0x64, 0x65, 0x74,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74,
-	0x79, 0x70, 0x65, 0x22, 0xc7, 0x01, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x64, 0x44, 0x65, 0x74, 0x65,
+	0x69, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x65,
+	0x78, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x19, 0x74, 0x65, 0x78, 0x74, 0x42,
+	0x6c, 0x6f, 0x63, 0x6b, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x7f, 0x0a, 0x1d, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x69,
+	0x63, 0x6f, 0x6e, 0x5f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x6f, 0x73, 0x2e, 0x75, 0x69,
+	0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x75, 0x73,
+	0x74, 0x6f, 0x6d, 0x49, 0x63, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x1a, 0x63, 0x75, 0x73, 0x74, 0x6f,
+	0x6d, 0x49, 0x63, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x18, 0x0a, 0x16, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22,
+	0x72, 0x0a, 0x0c, 0x54, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12,
+	0x17, 0x0a, 0x07, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x06, 0x74, 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x61, 0x72,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x12, 0x14,
+	0x0a, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d,
+	0x6f, 0x64, 0x65, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x6f, 0x73, 0x5f, 0x62, 0x75, 0x69,
+	0x6c, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x6f, 0x73, 0x42, 0x75,
+	0x69, 0x6c, 0x64, 0x22, 0xc7, 0x01, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x64, 0x44, 0x65, 0x74, 0x65,
 	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x04,
 	0x77, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52,
 	0x04, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x67, 0x65, 0x78, 0x5f, 0x6d,
@@ -741,29 +842,31 @@ func file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescGZIP() []byte
 	return file_google_chromeos_uidetection_v1_ui_detection_proto_rawDescData
 }
 
-var file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_google_chromeos_uidetection_v1_ui_detection_proto_goTypes = []interface{}{
 	(*UiDetectionRequest)(nil),         // 0: google.chromeos.uidetection.v1.UiDetectionRequest
 	(*DetectionRequest)(nil),           // 1: google.chromeos.uidetection.v1.DetectionRequest
-	(*WordDetectionRequest)(nil),       // 2: google.chromeos.uidetection.v1.WordDetectionRequest
-	(*TextBlockDetectionRequest)(nil),  // 3: google.chromeos.uidetection.v1.TextBlockDetectionRequest
-	(*CustomIconDetectionRequest)(nil), // 4: google.chromeos.uidetection.v1.CustomIconDetectionRequest
-	(*UiDetectionResponse)(nil),        // 5: google.chromeos.uidetection.v1.UiDetectionResponse
-	(*BoundingBox)(nil),                // 6: google.chromeos.uidetection.v1.BoundingBox
+	(*TestMetadata)(nil),               // 2: google.chromeos.uidetection.v1.TestMetadata
+	(*WordDetectionRequest)(nil),       // 3: google.chromeos.uidetection.v1.WordDetectionRequest
+	(*TextBlockDetectionRequest)(nil),  // 4: google.chromeos.uidetection.v1.TextBlockDetectionRequest
+	(*CustomIconDetectionRequest)(nil), // 5: google.chromeos.uidetection.v1.CustomIconDetectionRequest
+	(*UiDetectionResponse)(nil),        // 6: google.chromeos.uidetection.v1.UiDetectionResponse
+	(*BoundingBox)(nil),                // 7: google.chromeos.uidetection.v1.BoundingBox
 }
 var file_google_chromeos_uidetection_v1_ui_detection_proto_depIdxs = []int32{
 	1, // 0: google.chromeos.uidetection.v1.UiDetectionRequest.request:type_name -> google.chromeos.uidetection.v1.DetectionRequest
-	2, // 1: google.chromeos.uidetection.v1.DetectionRequest.word_detection_request:type_name -> google.chromeos.uidetection.v1.WordDetectionRequest
-	3, // 2: google.chromeos.uidetection.v1.DetectionRequest.text_block_detection_request:type_name -> google.chromeos.uidetection.v1.TextBlockDetectionRequest
-	4, // 3: google.chromeos.uidetection.v1.DetectionRequest.custom_icon_detection_request:type_name -> google.chromeos.uidetection.v1.CustomIconDetectionRequest
-	6, // 4: google.chromeos.uidetection.v1.UiDetectionResponse.bounding_boxes:type_name -> google.chromeos.uidetection.v1.BoundingBox
-	0, // 5: google.chromeos.uidetection.v1.UiDetectionService.ExecuteDetection:input_type -> google.chromeos.uidetection.v1.UiDetectionRequest
-	5, // 6: google.chromeos.uidetection.v1.UiDetectionService.ExecuteDetection:output_type -> google.chromeos.uidetection.v1.UiDetectionResponse
-	6, // [6:7] is the sub-list for method output_type
-	5, // [5:6] is the sub-list for method input_type
-	5, // [5:5] is the sub-list for extension type_name
-	5, // [5:5] is the sub-list for extension extendee
-	0, // [0:5] is the sub-list for field type_name
+	2, // 1: google.chromeos.uidetection.v1.UiDetectionRequest.test_metadata:type_name -> google.chromeos.uidetection.v1.TestMetadata
+	3, // 2: google.chromeos.uidetection.v1.DetectionRequest.word_detection_request:type_name -> google.chromeos.uidetection.v1.WordDetectionRequest
+	4, // 3: google.chromeos.uidetection.v1.DetectionRequest.text_block_detection_request:type_name -> google.chromeos.uidetection.v1.TextBlockDetectionRequest
+	5, // 4: google.chromeos.uidetection.v1.DetectionRequest.custom_icon_detection_request:type_name -> google.chromeos.uidetection.v1.CustomIconDetectionRequest
+	7, // 5: google.chromeos.uidetection.v1.UiDetectionResponse.bounding_boxes:type_name -> google.chromeos.uidetection.v1.BoundingBox
+	0, // 6: google.chromeos.uidetection.v1.UiDetectionService.ExecuteDetection:input_type -> google.chromeos.uidetection.v1.UiDetectionRequest
+	6, // 7: google.chromeos.uidetection.v1.UiDetectionService.ExecuteDetection:output_type -> google.chromeos.uidetection.v1.UiDetectionResponse
+	7, // [7:8] is the sub-list for method output_type
+	6, // [6:7] is the sub-list for method input_type
+	6, // [6:6] is the sub-list for extension type_name
+	6, // [6:6] is the sub-list for extension extendee
+	0, // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_google_chromeos_uidetection_v1_ui_detection_proto_init() }
@@ -797,7 +900,7 @@ func file_google_chromeos_uidetection_v1_ui_detection_proto_init() {
 			}
 		}
 		file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WordDetectionRequest); i {
+			switch v := v.(*TestMetadata); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -809,7 +912,7 @@ func file_google_chromeos_uidetection_v1_ui_detection_proto_init() {
 			}
 		}
 		file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TextBlockDetectionRequest); i {
+			switch v := v.(*WordDetectionRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -821,7 +924,7 @@ func file_google_chromeos_uidetection_v1_ui_detection_proto_init() {
 			}
 		}
 		file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CustomIconDetectionRequest); i {
+			switch v := v.(*TextBlockDetectionRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -833,7 +936,7 @@ func file_google_chromeos_uidetection_v1_ui_detection_proto_init() {
 			}
 		}
 		file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UiDetectionResponse); i {
+			switch v := v.(*CustomIconDetectionRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -845,6 +948,18 @@ func file_google_chromeos_uidetection_v1_ui_detection_proto_init() {
 			}
 		}
 		file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UiDetectionResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*BoundingBox); i {
 			case 0:
 				return &v.state
@@ -863,15 +978,15 @@ func file_google_chromeos_uidetection_v1_ui_detection_proto_init() {
 		(*DetectionRequest_TextBlockDetectionRequest)(nil),
 		(*DetectionRequest_CustomIconDetectionRequest)(nil),
 	}
-	file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[2].OneofWrappers = []interface{}{}
 	file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[3].OneofWrappers = []interface{}{}
+	file_google_chromeos_uidetection_v1_ui_detection_proto_msgTypes[4].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_google_chromeos_uidetection_v1_ui_detection_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/regen.txt b/regen.txt
index 3a207c690..8a14613ac 100644
--- a/regen.txt
+++ b/regen.txt
@@ -1 +1 @@
-0f498c731ec56906194615d44ff11defd3b26f93
\ No newline at end of file
+a8aece241a46fd51998dd4a1c731e3ec9a2b8ff2
\ No newline at end of file