[chrome/m74] Relax OS dimensions on non-master branches

Bug: skia:8891
Change-Id: I8e284cc4b815863d2f555dffb12322cfa6540219
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202704
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 2103f2d..39f68fc 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -40,11 +40,10 @@
 	ISOLATE_SDK_LINUX_NAME     = "Housekeeper-PerCommit-IsolateAndroidSDKLinux"
 	ISOLATE_WIN_TOOLCHAIN_NAME = "Housekeeper-PerCommit-IsolateWinToolchain"
 
-	DEFAULT_OS_DEBIAN    = "Debian-9.4"
-	DEFAULT_OS_LINUX_GCE = "Debian-9.8"
-	DEFAULT_OS_MAC       = "Mac-10.13.6"
-	DEFAULT_OS_UBUNTU    = "Ubuntu-14.04"
-	DEFAULT_OS_WIN       = "Windows-2016Server-14393"
+	DEFAULT_OS_DEBIAN    = "Debian"
+	DEFAULT_OS_LINUX_GCE = "Debian"
+	DEFAULT_OS_MAC       = "Mac"
+	DEFAULT_OS_WIN       = "Windows-2016Server"
 
 	DEFAULT_PROJECT = "skia"
 
@@ -451,30 +450,19 @@
 			"ChromeOS":   "ChromeOS",
 			"Debian9":    DEFAULT_OS_DEBIAN,
 			"Mac":        DEFAULT_OS_MAC,
-			"Mac10.13":   DEFAULT_OS_MAC,
-			"Mac10.14":   "Mac-10.14.3",
-			"Ubuntu14":   DEFAULT_OS_UBUNTU,
-			"Ubuntu17":   "Ubuntu-17.04",
-			"Ubuntu18":   "Ubuntu-18.04",
+			"Mac10.13":   "Mac-10.13",
+			"Mac10.14":   "Mac-10.14",
+			"Ubuntu18":   "Ubuntu",
 			"Win":        DEFAULT_OS_WIN,
-			"Win10":      "Windows-10-17763.292",
-			"Win2k8":     "Windows-2008ServerR2-SP1",
+			"Win10":      "Windows-10",
 			"Win2016":    DEFAULT_OS_WIN,
 			"Win7":       "Windows-7-SP1",
 			"Win8":       "Windows-8.1-SP0",
-			"iOS":        "iOS-11.4.1",
+			"iOS":        "iOS",
 		}[os]
 		if !ok {
 			glog.Fatalf("Entry %q not found in OS mapping.", os)
 		}
-		if os == "Win10" && parts["model"] == "Golo" {
-			// ChOps-owned machines have Windows 10 v1709, but a slightly different version than Skolo.
-			d["os"] = "Windows-10-16299.309"
-		}
-		if d["os"] == DEFAULT_OS_WIN {
-			// TODO(dogben): Temporarily add image dimension during upgrade.
-			d["image"] = "windows-server-2016-dc-v20190108"
-		}
 	} else {
 		d["os"] = DEFAULT_OS_DEBIAN
 	}
@@ -501,7 +489,7 @@
 				glog.Fatalf("Entry %q not found in Android mapping.", parts["model"])
 			}
 			d["device_type"] = deviceInfo[0]
-			d["device_os"] = deviceInfo[1]
+			// Ignore device_os on branches. d["device_os"] = deviceInfo[1]
 		} else if strings.Contains(parts["os"], "iOS") {
 			device, ok := map[string]string{
 				"iPadMini4": "iPad5,1",
@@ -568,16 +556,16 @@
 				return dockerGceDimensions()
 			} else if strings.Contains(parts["os"], "Win") {
 				gpu, ok := map[string]string{
-					"GT610":         "10de:104a-23.21.13.9101",
-					"GTX660":        "10de:11c0-25.21.14.1634",
-					"GTX960":        "10de:1401-25.21.14.1634",
-					"IntelHD4400":   "8086:0a16-20.19.15.4963",
-					"IntelIris540":  "8086:1926-25.20.100.6444",
-					"IntelIris6100": "8086:162b-20.19.15.4963",
-					"IntelIris655":  "8086:3ea5-25.20.100.6444",
-					"RadeonHD7770":  "1002:683d-24.20.13001.1010",
-					"RadeonR9M470X": "1002:6646-24.20.13001.1010",
-					"QuadroP400":    "10de:1cb3-25.21.14.1678",
+					"GT610":         "10de:104a",
+					"GTX660":        "10de:11c0",
+					"GTX960":        "10de:1401",
+					"IntelHD4400":   "8086:0a16",
+					"IntelIris540":  "8086:1926",
+					"IntelIris6100": "8086:162b",
+					"IntelIris655":  "8086:3ea5",
+					"RadeonHD7770":  "1002:683d",
+					"RadeonR9M470X": "1002:6646",
+					"QuadroP400":    "10de:1cb3",
 				}[parts["cpu_or_gpu_value"]]
 				if !ok {
 					glog.Fatalf("Entry %q not found in Win GPU mapping.", parts["cpu_or_gpu_value"])
@@ -590,14 +578,14 @@
 					"IntelHD2000":   "8086:0102",
 					"IntelHD405":    "8086:22b1",
 					"IntelIris640":  "8086:5926",
-					"QuadroP400":    "10de:1cb3-384.59",
+					"QuadroP400":    "10de:1cb3",
 				}[parts["cpu_or_gpu_value"]]
 				if !ok {
 					glog.Fatalf("Entry %q not found in Ubuntu GPU mapping.", parts["cpu_or_gpu_value"])
 				}
 				if parts["os"] == "Ubuntu18" && parts["cpu_or_gpu_value"] == "QuadroP400" {
 					// Ubuntu18 has a newer GPU driver.
-					gpu = "10de:1cb3-415.27"
+					gpu = "10de:1cb3"
 				}
 				d["gpu"] = gpu
 			} else if strings.Contains(parts["os"], "Mac") {
@@ -605,7 +593,7 @@
 					"IntelHD6000":   "8086:1626",
 					"IntelHD615":    "8086:591e",
 					"IntelIris5100": "8086:0a2e",
-					"RadeonHD8870M": "1002:6821-4.0.20-3.2.8",
+					"RadeonHD8870M": "1002:6821",
 				}[parts["cpu_or_gpu_value"]]
 				if !ok {
 					glog.Fatalf("Entry %q not found in Mac GPU mapping.", parts["cpu_or_gpu_value"])
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index d3da37d..c426a73 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -3292,7 +3292,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -3417,7 +3417,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -3556,7 +3556,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -3690,7 +3690,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -3815,7 +3815,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -3940,7 +3940,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -4065,7 +4065,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -4190,7 +4190,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -4315,7 +4315,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -4454,7 +4454,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -4588,7 +4588,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -4713,7 +4713,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -4838,7 +4838,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -4963,7 +4963,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -5088,7 +5088,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -5213,7 +5213,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -5338,7 +5338,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -5463,7 +5463,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -5560,7 +5560,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -5654,7 +5654,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -5776,7 +5776,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -5901,7 +5901,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -6030,7 +6030,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -6155,7 +6155,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -6280,7 +6280,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -6405,7 +6405,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -6530,7 +6530,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -6658,7 +6658,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -6787,7 +6787,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -6916,7 +6916,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -7045,7 +7045,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -7179,7 +7179,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -7308,7 +7308,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -7447,7 +7447,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -7576,7 +7576,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -7705,7 +7705,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -7834,7 +7834,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -7968,7 +7968,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -8097,7 +8097,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -8226,7 +8226,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -8355,7 +8355,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -8484,7 +8484,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -8613,7 +8613,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -8742,7 +8742,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -8871,7 +8871,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -9004,7 +9004,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -9139,7 +9139,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -9268,7 +9268,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -9393,7 +9393,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -9522,7 +9522,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -9651,7 +9651,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -9780,7 +9780,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -9909,7 +9909,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -10038,7 +10038,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -10167,7 +10167,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -10301,7 +10301,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -10430,7 +10430,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -10559,7 +10559,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -10688,7 +10688,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -10817,7 +10817,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -10945,7 +10945,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -11074,7 +11074,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -11203,7 +11203,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -11332,7 +11332,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -11461,7 +11461,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -11590,7 +11590,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -11719,7 +11719,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -11848,7 +11848,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -11978,7 +11978,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -12107,7 +12107,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -12236,7 +12236,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -12365,7 +12365,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -12489,7 +12489,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -12613,7 +12613,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -12737,7 +12737,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -12861,7 +12861,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -12985,7 +12985,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -13109,7 +13109,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -13233,7 +13233,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -13357,7 +13357,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -13489,7 +13489,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -13621,7 +13621,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -13749,7 +13749,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -13881,7 +13881,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -14013,7 +14013,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -14145,7 +14145,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -14277,7 +14277,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -14409,7 +14409,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -14541,7 +14541,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -14673,7 +14673,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -14805,7 +14805,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -14942,7 +14942,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -15074,7 +15074,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -15206,7 +15206,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -15338,7 +15338,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -15470,7 +15470,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -15607,7 +15607,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -15739,7 +15739,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.6",
+        "os:Mac",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -15872,9 +15872,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16008,9 +16007,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16144,9 +16142,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16280,9 +16277,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16416,9 +16412,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16552,9 +16547,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16693,9 +16687,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16829,9 +16822,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16965,9 +16957,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17101,9 +17092,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17237,9 +17227,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17373,9 +17362,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17509,9 +17497,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17645,9 +17632,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17776,9 +17762,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17907,9 +17892,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -18038,9 +18022,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -18169,9 +18152,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -18300,9 +18282,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -18431,9 +18412,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -18562,9 +18542,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -18693,9 +18672,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -18824,9 +18802,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -18955,9 +18932,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -19086,9 +19062,8 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -19191,7 +19166,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -19294,7 +19269,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -19397,7 +19372,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -19500,7 +19475,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -19603,7 +19578,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -19706,7 +19681,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -19809,7 +19784,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -19912,7 +19887,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -20039,7 +20014,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -20163,8 +20138,8 @@
         "Housekeeper-PerCommit-IsolateSVG"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "rack:2"
       ],
@@ -20284,7 +20259,7 @@
       ],
       "dimensions": [
         "pool:SkiaCT",
-        "os:Debian-9.8"
+        "os:Debian"
       ],
       "env_prefixes": {
         "PATH": [
@@ -20402,7 +20377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -20525,7 +20500,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -20646,7 +20621,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -20699,7 +20674,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -20787,7 +20762,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -20918,7 +20893,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -20957,7 +20932,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "isolate": "empty.isolate"
@@ -20980,7 +20955,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "isolate": "empty.isolate"
@@ -21003,7 +20978,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "isolate": "empty.isolate"
@@ -21026,7 +21001,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "isolate": "empty.isolate"
@@ -21049,7 +21024,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "isolate": "empty.isolate"
@@ -21072,7 +21047,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "isolate": "empty.isolate"
@@ -21173,7 +21148,7 @@
       ],
       "dimensions": [
         "pool:SkiaCT",
-        "os:Debian-9.8"
+        "os:Debian"
       ],
       "env_prefixes": {
         "PATH": [
@@ -21267,7 +21242,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
         "pool:Skia"
@@ -21367,7 +21341,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
         "pool:Skia"
@@ -21467,7 +21440,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -21567,7 +21539,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -21667,7 +21638,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -21767,7 +21737,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
         "device_type:herolte",
         "os:Android",
         "pool:Skia"
@@ -21867,7 +21836,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
         "device_type:herolte",
         "os:Android",
         "pool:Skia"
@@ -21967,7 +21935,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
         "device_type:herolte",
         "os:Android",
         "pool:Skia"
@@ -22067,7 +22034,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
         "device_type:herolte",
         "os:Android",
         "pool:Skia"
@@ -22167,7 +22133,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G960FXXU2BRJ8",
         "device_type:starlte",
         "os:Android",
         "pool:Skia"
@@ -22267,7 +22232,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G960FXXU2BRJ8",
         "device_type:starlte",
         "os:Android",
         "pool:Skia"
@@ -22367,7 +22331,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G960FXXU2BRJ8",
         "device_type:starlte",
         "os:Android",
         "pool:Skia"
@@ -22467,7 +22430,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G960FXXU2BRJ8",
         "device_type:starlte",
         "os:Android",
         "pool:Skia"
@@ -22567,7 +22529,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -22667,7 +22628,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -22767,7 +22727,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -22867,7 +22826,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -22967,7 +22925,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -23067,7 +23024,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -23167,7 +23123,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -23267,7 +23222,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -23367,7 +23321,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -23467,7 +23420,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -23567,7 +23519,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
@@ -23667,7 +23618,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
@@ -23767,7 +23717,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
@@ -23867,7 +23816,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
@@ -23967,7 +23915,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -24067,7 +24014,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -24167,7 +24113,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -24267,7 +24212,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -24367,7 +24311,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -24467,7 +24410,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -24567,7 +24509,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -24667,7 +24608,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
         "pool:Skia"
@@ -24767,7 +24707,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
         "pool:Skia"
@@ -24867,7 +24806,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
         "pool:Skia"
@@ -24967,7 +24905,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
         "pool:Skia"
@@ -25067,7 +25004,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -25167,7 +25103,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -25267,7 +25202,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -25367,7 +25301,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -25467,7 +25400,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -25567,7 +25499,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -25665,7 +25596,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -25763,7 +25693,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -25863,7 +25792,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -25961,7 +25889,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -26061,7 +25988,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -26161,7 +26087,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -26261,7 +26186,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -26359,7 +26283,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -26457,7 +26380,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -26557,7 +26479,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -26655,7 +26576,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -27953,7 +27873,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
         "pool:Skia"
@@ -28051,7 +27970,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
         "pool:Skia"
@@ -28149,7 +28067,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
         "pool:Skia"
@@ -28247,7 +28164,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
         "pool:Skia"
@@ -28361,7 +28277,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -28473,7 +28389,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -28590,7 +28506,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -28702,7 +28618,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -28819,7 +28735,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -28931,7 +28847,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -29043,7 +28959,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -29155,7 +29071,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -29272,7 +29188,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -29384,7 +29300,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -29496,7 +29412,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -29608,7 +29524,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -29720,7 +29636,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -29831,7 +29747,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Skylake_GCE",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -29942,7 +29858,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Skylake_GCE",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -30058,7 +29974,7 @@
       ],
       "dimensions": [
         "gpu:8086:22b1",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -30179,7 +30095,7 @@
       ],
       "dimensions": [
         "gpu:8086:22b1",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -30295,7 +30211,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -30416,7 +30332,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -30532,7 +30448,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -30653,7 +30569,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -30769,7 +30685,7 @@
       ],
       "dimensions": [
         "gpu:8086:0f31",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -30885,7 +30801,7 @@
       ],
       "dimensions": [
         "gpu:8086:0f31",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -31001,7 +30917,7 @@
       ],
       "dimensions": [
         "gpu:8086:0102",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -31117,7 +31033,7 @@
       ],
       "dimensions": [
         "gpu:8086:0102",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -31214,7 +31130,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -31311,7 +31227,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -31408,7 +31324,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -31506,7 +31422,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -31619,7 +31535,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -31731,7 +31647,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -31842,7 +31758,7 @@
       ],
       "dimensions": [
         "gpu:8086:591e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -31953,7 +31869,7 @@
       ],
       "dimensions": [
         "gpu:8086:591e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -32064,7 +31980,7 @@
       ],
       "dimensions": [
         "gpu:8086:591e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -32175,7 +32091,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i7-4870HQ",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -32286,7 +32202,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i7-4870HQ",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -32397,7 +32313,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i7-4870HQ",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -32507,8 +32423,8 @@
         "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -32618,8 +32534,8 @@
         "Build-Mac-Clang-x86_64-Debug-MoltenVK_Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -32729,8 +32645,8 @@
         "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -32840,8 +32756,8 @@
         "Build-Mac-Clang-x86_64-Release-CommandBuffer"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -32951,8 +32867,8 @@
         "Build-Mac-Clang-x86_64-Release-MoltenVK_Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -33064,7 +32980,7 @@
       "dimensions": [
         "cpu:x86-64-i7-4578U",
         "gpu:8086:0a2e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -33176,7 +33092,7 @@
       "dimensions": [
         "cpu:x86-64-i7-4578U",
         "gpu:8086:0a2e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -33288,7 +33204,7 @@
       "dimensions": [
         "cpu:x86-64-i7-4578U",
         "gpu:8086:0a2e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -33399,7 +33315,7 @@
       ],
       "dimensions": [
         "gpu:8086:1626",
-        "os:Mac-10.14.3",
+        "os:Mac-10.14",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -33510,7 +33426,7 @@
       ],
       "dimensions": [
         "gpu:8086:1626",
-        "os:Mac-10.14.3",
+        "os:Mac-10.14",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -33621,7 +33537,7 @@
       ],
       "dimensions": [
         "gpu:8086:1626",
-        "os:Mac-10.14.3",
+        "os:Mac-10.14",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -33731,8 +33647,8 @@
         "Build-Debian9-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "rack:2"
       ],
@@ -33848,8 +33764,8 @@
         "Build-Debian9-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "rack:2"
       ],
@@ -33965,8 +33881,8 @@
         "Build-Debian9-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "rack:2"
       ],
@@ -34077,8 +33993,8 @@
         "Build-Debian9-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "rack:2"
       ],
@@ -34194,8 +34110,8 @@
         "Build-Debian9-Clang-x86_64-Release-ASAN"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "rack:2"
       ],
@@ -34311,8 +34227,8 @@
         "Build-Debian9-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "rack:2"
       ],
@@ -34428,8 +34344,8 @@
         "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "valgrind:1",
         "rack:2"
@@ -34546,8 +34462,8 @@
         "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "valgrind:1",
         "rack:2"
@@ -34664,8 +34580,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -34780,8 +34696,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -34896,8 +34812,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35012,8 +34928,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35128,8 +35044,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35244,8 +35160,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35360,8 +35276,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "gpu:10de:104a",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35476,8 +35392,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "gpu:10de:104a",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35592,8 +35508,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "gpu:10de:104a",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35708,8 +35624,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "gpu:10de:104a",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35824,8 +35740,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -35941,8 +35857,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -36058,8 +35974,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -36175,8 +36091,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -36292,8 +36208,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -36409,8 +36325,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -36512,8 +36428,8 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -36615,8 +36531,8 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -36718,8 +36634,8 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -36835,8 +36751,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:162b",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -36951,8 +36867,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:162b",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37067,8 +36983,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:162b",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37183,8 +37099,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:162b",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37299,8 +37215,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37415,8 +37331,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37531,8 +37447,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37647,8 +37563,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37763,8 +37679,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37879,8 +37795,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37995,8 +37911,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38111,8 +38027,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38227,8 +38143,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38343,8 +38259,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38459,8 +38375,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38575,8 +38491,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38691,8 +38607,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:0a16",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38807,8 +38723,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:0a16",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38923,8 +38839,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:0a16",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39039,8 +38955,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:0a16",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39155,8 +39071,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39271,8 +39187,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39387,8 +39303,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39503,8 +39419,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39619,8 +39535,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39735,8 +39651,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39851,8 +39767,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39967,8 +39883,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40083,8 +39999,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40199,8 +40115,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40315,8 +40231,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40431,8 +40347,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40547,8 +40463,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40663,8 +40579,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40779,8 +40695,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40895,8 +40811,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41011,8 +40927,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41127,8 +41043,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41243,8 +41159,8 @@
         "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -41360,8 +41276,8 @@
         "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -41477,8 +41393,8 @@
         "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -41594,8 +41510,8 @@
         "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia",
         "rack:1"
       ],
@@ -41712,9 +41628,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41830,9 +41745,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41948,9 +41862,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -42066,9 +41979,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -42184,9 +42096,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -42302,9 +42213,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -42420,9 +42330,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -42985,7 +42894,7 @@
       ],
       "dimensions": [
         "device:iPad6,3",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -43084,7 +42993,7 @@
       ],
       "dimensions": [
         "device:iPad6,3",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -43183,7 +43092,7 @@
       ],
       "dimensions": [
         "device:iPhone7,2",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -43282,7 +43191,7 @@
       ],
       "dimensions": [
         "device:iPhone7,2",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -43381,7 +43290,7 @@
       ],
       "dimensions": [
         "device:iPhone9,1",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -43480,7 +43389,7 @@
       ],
       "dimensions": [
         "device:iPhone9,1",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -43578,7 +43487,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
         "pool:Skia"
@@ -43678,7 +43586,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
         "pool:Skia"
@@ -43778,7 +43685,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -43878,7 +43784,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -43978,7 +43883,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -44078,7 +43982,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -44178,7 +44081,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -44278,7 +44180,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
         "device_type:herolte",
         "os:Android",
         "pool:Skia"
@@ -44378,7 +44279,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
         "device_type:herolte",
         "os:Android",
         "pool:Skia"
@@ -44478,7 +44378,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
         "device_type:herolte",
         "os:Android",
         "pool:Skia"
@@ -44578,7 +44477,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
         "device_type:herolte",
         "os:Android",
         "pool:Skia"
@@ -44678,7 +44576,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G960FXXU2BRJ8",
         "device_type:starlte",
         "os:Android",
         "pool:Skia"
@@ -44778,7 +44675,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G960FXXU2BRJ8",
         "device_type:starlte",
         "os:Android",
         "pool:Skia"
@@ -44878,7 +44774,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G960FXXU2BRJ8",
         "device_type:starlte",
         "os:Android",
         "pool:Skia"
@@ -44978,7 +44873,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G960FXXU2BRJ8",
         "device_type:starlte",
         "os:Android",
         "pool:Skia"
@@ -45078,7 +44972,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -45178,7 +45071,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -45278,7 +45170,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -45378,7 +45269,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -45478,7 +45368,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -45578,7 +45467,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -45678,7 +45566,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NPJS25.93-14.7-8",
         "device_type:athene",
         "os:Android",
         "pool:Skia"
@@ -45778,7 +45665,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -45878,7 +45764,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -45978,7 +45863,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -46078,7 +45962,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -46178,7 +46061,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -46278,7 +46160,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -46378,7 +46259,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -46478,7 +46358,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
@@ -46578,7 +46457,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
@@ -46678,7 +46556,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
@@ -46778,7 +46655,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
@@ -46878,7 +46754,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -46978,7 +46853,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -47078,7 +46952,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -47178,7 +47051,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -47278,7 +47150,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -47378,7 +47249,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -47478,7 +47348,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -47578,7 +47447,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
         "pool:Skia"
@@ -47678,7 +47546,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
         "pool:Skia"
@@ -47778,7 +47645,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
         "pool:Skia"
@@ -47878,7 +47744,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
         "pool:Skia"
@@ -47978,7 +47843,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
         "pool:Skia"
@@ -48078,7 +47942,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -48178,7 +48041,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -48278,7 +48140,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -48378,7 +48239,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -48479,7 +48339,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -48580,7 +48439,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -48681,7 +48539,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -48782,7 +48639,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -48882,7 +48738,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -48982,7 +48837,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -49082,7 +48936,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -49182,7 +49035,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -49283,7 +49135,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -49384,7 +49235,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -49484,7 +49334,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:sailfish",
         "os:Android",
         "pool:Skia"
@@ -49584,7 +49433,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -49684,7 +49532,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -49784,7 +49631,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -49884,7 +49730,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -49984,7 +49829,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -50084,7 +49928,6 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -51382,7 +51225,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
         "pool:Skia"
@@ -51480,7 +51322,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
         "pool:Skia"
@@ -51578,7 +51419,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
         "pool:Skia"
@@ -51676,7 +51516,6 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
         "pool:Skia"
@@ -51790,7 +51629,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -51902,7 +51741,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -52019,7 +51858,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -52131,7 +51970,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -52248,7 +52087,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -52360,7 +52199,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -52472,7 +52311,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -52584,7 +52423,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -52696,7 +52535,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -52808,7 +52647,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -52925,7 +52764,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -53037,7 +52876,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -53149,7 +52988,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -53261,7 +53100,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -53373,7 +53212,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -53485,7 +53324,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -53597,7 +53436,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -53714,7 +53553,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -53825,7 +53664,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Skylake_GCE",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -53936,7 +53775,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Skylake_GCE",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -54048,7 +53887,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -54160,7 +53999,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -54276,7 +54115,7 @@
       ],
       "dimensions": [
         "gpu:8086:22b1",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -54397,7 +54236,7 @@
       ],
       "dimensions": [
         "gpu:8086:22b1",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -54513,7 +54352,7 @@
       ],
       "dimensions": [
         "gpu:8086:22b1",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -54634,7 +54473,7 @@
       ],
       "dimensions": [
         "gpu:8086:22b1",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -54747,7 +54586,7 @@
         "cpu:x86-64-i5-7260U",
         "docker_installed:true",
         "kvm:1",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -54863,7 +54702,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -54979,7 +54818,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -55100,7 +54939,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -55216,7 +55055,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -55337,7 +55176,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -55463,7 +55302,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -55584,7 +55423,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -55710,7 +55549,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -55831,7 +55670,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -55947,7 +55786,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -56068,7 +55907,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -56194,7 +56033,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -56315,7 +56154,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -56441,7 +56280,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -56562,7 +56401,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -56683,7 +56522,7 @@
       ],
       "dimensions": [
         "gpu:8086:5926",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -56799,7 +56638,7 @@
       ],
       "dimensions": [
         "gpu:8086:0f31",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -56915,7 +56754,7 @@
       ],
       "dimensions": [
         "gpu:8086:0f31",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -57031,7 +56870,7 @@
       ],
       "dimensions": [
         "gpu:8086:0102",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -57147,7 +56986,7 @@
       ],
       "dimensions": [
         "gpu:8086:0102",
-        "os:Debian-9.4",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -57244,7 +57083,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -57341,7 +57180,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -57438,7 +57277,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -57536,7 +57375,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -57649,7 +57488,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -57761,7 +57600,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -57873,7 +57712,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -57985,7 +57824,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -58096,7 +57935,7 @@
       ],
       "dimensions": [
         "gpu:8086:591e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -58207,7 +58046,7 @@
       ],
       "dimensions": [
         "gpu:8086:591e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -58318,7 +58157,7 @@
       ],
       "dimensions": [
         "gpu:8086:591e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -58429,7 +58268,7 @@
       ],
       "dimensions": [
         "gpu:8086:591e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -58540,7 +58379,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i7-4870HQ",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -58651,7 +58490,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i7-4870HQ",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -58762,7 +58601,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i7-4870HQ",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -58873,7 +58712,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i7-4870HQ",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -58984,7 +58823,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i7-4870HQ",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -59094,8 +58933,8 @@
         "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -59205,8 +59044,8 @@
         "Build-Mac-Clang-x86_64-Debug-CommandBuffer"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -59316,8 +59155,8 @@
         "Build-Mac-Clang-x86_64-Debug-Metal"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -59427,8 +59266,8 @@
         "Build-Mac-Clang-x86_64-Debug-MoltenVK_Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -59538,8 +59377,8 @@
         "Build-Mac-Clang-x86_64-Debug-OpenCL"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -59649,8 +59488,8 @@
         "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -59760,8 +59599,8 @@
         "Build-Mac-Clang-x86_64-Release-Metal"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -59871,8 +59710,8 @@
         "Build-Mac-Clang-x86_64-Release-MoltenVK_Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -59982,8 +59821,8 @@
         "Build-Mac-Clang-x86_64-Release-TSAN"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
-        "os:Mac-10.13.6",
+        "gpu:1002:6821",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -60095,7 +59934,7 @@
       "dimensions": [
         "cpu:x86-64-i7-4578U",
         "gpu:8086:0a2e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -60207,7 +60046,7 @@
       "dimensions": [
         "cpu:x86-64-i7-4578U",
         "gpu:8086:0a2e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -60319,7 +60158,7 @@
       "dimensions": [
         "cpu:x86-64-i7-4578U",
         "gpu:8086:0a2e",
-        "os:Mac-10.13.6",
+        "os:Mac-10.13",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -60430,7 +60269,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i5-5350U",
-        "os:Mac-10.14.3",
+        "os:Mac-10.14",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -60541,7 +60380,7 @@
       ],
       "dimensions": [
         "gpu:8086:1626",
-        "os:Mac-10.14.3",
+        "os:Mac-10.14",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -60652,7 +60491,7 @@
       ],
       "dimensions": [
         "gpu:8086:1626",
-        "os:Mac-10.14.3",
+        "os:Mac-10.14",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -60763,7 +60602,7 @@
       ],
       "dimensions": [
         "gpu:8086:1626",
-        "os:Mac-10.14.3",
+        "os:Mac-10.14",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -60873,8 +60712,8 @@
         "Build-Debian9-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -60989,8 +60828,8 @@
         "Build-Debian9-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -61100,8 +60939,8 @@
         "Build-Debian9-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -61216,8 +61055,8 @@
         "Build-Debian9-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -61327,8 +61166,8 @@
         "Build-Debian9-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -61443,8 +61282,8 @@
         "Build-Debian9-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -61559,8 +61398,8 @@
         "Build-Debian9-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -61675,8 +61514,8 @@
         "Build-Debian9-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -61786,8 +61625,8 @@
         "Build-Debian9-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -61902,8 +61741,8 @@
         "Build-Debian9-Clang-x86_64-Release-ASAN"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -62018,8 +61857,8 @@
         "Build-Debian9-Clang-x86_64-Release-ASAN"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -62134,8 +61973,8 @@
         "Build-Debian9-Clang-x86_64-Release-TSAN"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -62255,8 +62094,8 @@
         "Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -62366,8 +62205,8 @@
         "Build-Debian9-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -62482,8 +62321,8 @@
         "Build-Debian9-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -62598,8 +62437,8 @@
         "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "valgrind:1"
       ],
@@ -62715,8 +62554,8 @@
         "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "valgrind:1"
       ],
@@ -62832,8 +62671,8 @@
         "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-415.27",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3",
+        "os:Ubuntu",
         "pool:Skia",
         "valgrind:1"
       ],
@@ -62949,8 +62788,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63065,8 +62904,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63181,8 +63020,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63297,8 +63136,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63413,8 +63252,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63529,8 +63368,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:6646",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63645,8 +63484,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "gpu:10de:104a",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63761,8 +63600,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "gpu:10de:104a",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63877,8 +63716,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "gpu:10de:104a",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63993,8 +63832,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "gpu:10de:104a",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64109,8 +63948,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64225,8 +64064,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64341,8 +64180,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64457,8 +64296,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64578,8 +64417,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64694,8 +64533,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64810,8 +64649,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64926,8 +64765,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65042,8 +64881,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65158,8 +64997,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65279,8 +65118,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65396,7 +65235,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i7-5557U",
-        "os:Windows-10-17763.292",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65511,8 +65350,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:162b",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65627,8 +65466,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:162b",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65743,8 +65582,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:162b",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65859,8 +65698,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:162b",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65975,8 +65814,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66091,8 +65930,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66207,8 +66046,8 @@
         "Build-Win-Clang-x86_64-Debug-OpenCL"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66323,8 +66162,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66439,8 +66278,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66555,8 +66394,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66671,8 +66510,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66787,8 +66626,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:1926-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:1926",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66903,8 +66742,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67019,8 +66858,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67135,8 +66974,8 @@
         "Build-Win-Clang-x86_64-Debug-OpenCL"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67251,8 +67090,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67367,8 +67206,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67483,8 +67322,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67599,8 +67438,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-25.20.100.6444",
-        "os:Windows-10-17763.292",
+        "gpu:8086:3ea5",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67715,8 +67554,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:0a16",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67831,8 +67670,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:0a16",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67947,8 +67786,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:0a16",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68063,8 +67902,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.292",
+        "gpu:8086:0a16",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68179,8 +68018,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68295,8 +68134,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68411,8 +68250,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68527,8 +68366,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68643,8 +68482,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68759,8 +68598,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:11c0",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68875,8 +68714,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68991,8 +68830,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69107,8 +68946,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69223,8 +69062,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69339,8 +69178,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69455,8 +69294,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.292",
+        "gpu:1002:683d",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69571,8 +69410,8 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69687,8 +69526,8 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69803,8 +69642,8 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69919,8 +69758,8 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70035,8 +69874,8 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70151,8 +69990,8 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.292",
+        "gpu:10de:1401",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70267,8 +70106,8 @@
         "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70383,8 +70222,8 @@
         "Build-Win-MSVC-x86_64-Debug-MSRTC"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70499,8 +70338,8 @@
         "Build-Win-MSVC-x86_64-Debug-MSRTC_Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70615,8 +70454,8 @@
         "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70731,8 +70570,8 @@
         "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70847,8 +70686,8 @@
         "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "gpu:10de:1cb3",
+        "os:Windows-10",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70964,9 +70803,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71082,9 +70920,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71200,9 +71037,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71318,9 +71154,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71436,9 +71271,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71554,9 +71388,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71672,9 +71505,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71790,9 +71622,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71908,9 +71739,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72026,9 +71856,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72144,9 +71973,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72262,9 +72090,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72380,9 +72207,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72498,9 +72324,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72616,9 +72441,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72734,9 +72558,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72852,9 +72675,8 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-2016Server",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -74113,7 +73935,7 @@
       ],
       "dimensions": [
         "device:iPad6,3",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -74212,7 +74034,7 @@
       ],
       "dimensions": [
         "device:iPad6,3",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -74311,7 +74133,7 @@
       ],
       "dimensions": [
         "device:iPhone7,2",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -74410,7 +74232,7 @@
       ],
       "dimensions": [
         "device:iPhone7,2",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -74509,7 +74331,7 @@
       ],
       "dimensions": [
         "device:iPhone9,1",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -74608,7 +74430,7 @@
       ],
       "dimensions": [
         "device:iPhone9,1",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -74707,7 +74529,7 @@
       ],
       "dimensions": [
         "device:iPhone9,1",
-        "os:iOS-11.4.1",
+        "os:iOS",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -74805,7 +74627,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -74900,7 +74722,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -74995,7 +74817,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -75090,7 +74912,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -75190,7 +75012,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -75290,7 +75112,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -75390,7 +75212,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -75490,7 +75312,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -75590,7 +75412,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -75690,7 +75512,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -75790,7 +75612,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -75890,7 +75712,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -75990,7 +75812,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -76090,7 +75912,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -76190,7 +76012,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -76290,7 +76112,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -76390,7 +76212,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -76490,7 +76312,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -76590,7 +76412,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -76690,7 +76512,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -76790,7 +76612,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -76890,7 +76712,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -76990,7 +76812,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -77090,7 +76912,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -77190,7 +77012,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -77290,7 +77112,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -77390,7 +77212,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -77490,7 +77312,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -77590,7 +77412,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -77690,7 +77512,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -77790,7 +77612,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -77890,7 +77712,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -77990,7 +77812,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -78090,7 +77912,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -78190,7 +78012,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -78290,7 +78112,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -78390,7 +78212,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -78490,7 +78312,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -78590,7 +78412,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -78690,7 +78512,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -78790,7 +78612,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -78890,7 +78712,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -78990,7 +78812,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -79090,7 +78912,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -79190,7 +79012,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -79290,7 +79112,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -79390,7 +79212,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -79490,7 +79312,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -79590,7 +79412,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -79690,7 +79512,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -79790,7 +79612,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -79890,7 +79712,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -79990,7 +79812,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -80090,7 +79912,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -80190,7 +80012,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -80290,7 +80112,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -80390,7 +80212,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -80490,7 +80312,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -80590,7 +80412,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -80690,7 +80512,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -80790,7 +80612,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -80890,7 +80712,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -80990,7 +80812,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -81090,7 +80912,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -81190,7 +81012,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -81290,7 +81112,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -81390,7 +81212,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -81490,7 +81312,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -81590,7 +81412,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -81690,7 +81512,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -81790,7 +81612,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -81890,7 +81712,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -81990,7 +81812,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -82090,7 +81912,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -82190,7 +82012,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -82290,7 +82112,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -82390,7 +82212,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -82490,7 +82312,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -82590,7 +82412,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -82695,7 +82517,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -82800,7 +82622,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -82905,7 +82727,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -83010,7 +82832,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -83115,7 +82937,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -83220,7 +83042,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -83325,7 +83147,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -83430,7 +83252,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -83535,7 +83357,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -83640,7 +83462,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -83745,7 +83567,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -83850,7 +83672,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -83955,7 +83777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -84060,7 +83882,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -84165,7 +83987,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -84270,7 +84092,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -84375,7 +84197,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -84480,7 +84302,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -84585,7 +84407,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -84690,7 +84512,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -84795,7 +84617,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -84900,7 +84722,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -85005,7 +84827,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -85110,7 +84932,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -85215,7 +85037,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -85320,7 +85142,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -85425,7 +85247,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -85530,7 +85352,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -85635,7 +85457,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -85740,7 +85562,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -85845,7 +85667,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -85950,7 +85772,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -86055,7 +85877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -86155,7 +85977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -86255,7 +86077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -86355,7 +86177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -86455,7 +86277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -86555,7 +86377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -86655,7 +86477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -86755,7 +86577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -86855,7 +86677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -86955,7 +86777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -87055,7 +86877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -87155,7 +86977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -87255,7 +87077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -87355,7 +87177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -87455,7 +87277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -87555,7 +87377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -87655,7 +87477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -87755,7 +87577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -87855,7 +87677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -87955,7 +87777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -88055,7 +87877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -88155,7 +87977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -88255,7 +88077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -88355,7 +88177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -88455,7 +88277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -88555,7 +88377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -88655,7 +88477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -88755,7 +88577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -88855,7 +88677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -88955,7 +88777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -89055,7 +88877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -89155,7 +88977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -89255,7 +89077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -89355,7 +89177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -89455,7 +89277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -89555,7 +89377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -89655,7 +89477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -89755,7 +89577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -89855,7 +89677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -89955,7 +89777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -90055,7 +89877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -90155,7 +89977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -90255,7 +90077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -90355,7 +90177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -90455,7 +90277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -90555,7 +90377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -90655,7 +90477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -90755,7 +90577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -90855,7 +90677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -90955,7 +90777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -91055,7 +90877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -91155,7 +90977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -91255,7 +91077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -91355,7 +91177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -91455,7 +91277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -91555,7 +91377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -91655,7 +91477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -91755,7 +91577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -91855,7 +91677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -91955,7 +91777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -92055,7 +91877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -92155,7 +91977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -92255,7 +92077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -92355,7 +92177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -92455,7 +92277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -92555,7 +92377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -92655,7 +92477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -92755,7 +92577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -92855,7 +92677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -92955,7 +92777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -93055,7 +92877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -93155,7 +92977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -93255,7 +93077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -93355,7 +93177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -93455,7 +93277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -93555,7 +93377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -93655,7 +93477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -93755,7 +93577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -93855,7 +93677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -93955,7 +93777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -94055,7 +93877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -94155,7 +93977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -94255,7 +94077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -94355,7 +94177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -94455,7 +94277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -94555,7 +94377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -94655,7 +94477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -94755,7 +94577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -94855,7 +94677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -94955,7 +94777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -95055,7 +94877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -95155,7 +94977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -95255,7 +95077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -95355,7 +95177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -95455,7 +95277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -95555,7 +95377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -95655,7 +95477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -95755,7 +95577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -95855,7 +95677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -95955,7 +95777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -96055,7 +95877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -96155,7 +95977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -96255,7 +96077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -96355,7 +96177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -96455,7 +96277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -96555,7 +96377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -96655,7 +96477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -96755,7 +96577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -96855,7 +96677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -96955,7 +96777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -97055,7 +96877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -97155,7 +96977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -97255,7 +97077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -97355,7 +97177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -97455,7 +97277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -97555,7 +97377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -97655,7 +97477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -97755,7 +97577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -97855,7 +97677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -97955,7 +97777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -98055,7 +97877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -98155,7 +97977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -98255,7 +98077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -98355,7 +98177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -98455,7 +98277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -98555,7 +98377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -98655,7 +98477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -98755,7 +98577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -98855,7 +98677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -98955,7 +98777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -99055,7 +98877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -99155,7 +98977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -99255,7 +99077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -99355,7 +99177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -99455,7 +99277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -99555,7 +99377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -99655,7 +99477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -99755,7 +99577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -99855,7 +99677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -99955,7 +99777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -100055,7 +99877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -100155,7 +99977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -100255,7 +100077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -100355,7 +100177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -100455,7 +100277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -100555,7 +100377,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -100655,7 +100477,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -100755,7 +100577,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -100855,7 +100677,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -100955,7 +100777,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -101055,7 +100877,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -101160,7 +100982,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -101265,7 +101087,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -101370,7 +101192,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -101475,7 +101297,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -101580,7 +101402,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -101685,7 +101507,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -101790,7 +101612,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -101895,7 +101717,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -102000,7 +101822,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -102105,7 +101927,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -102210,7 +102032,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -102315,7 +102137,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -102420,7 +102242,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -102525,7 +102347,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -102630,7 +102452,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -102735,7 +102557,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -102840,7 +102662,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -102945,7 +102767,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -103050,7 +102872,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -103155,7 +102977,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -103260,7 +103082,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -103365,7 +103187,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -103470,7 +103292,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -103575,7 +103397,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -103680,7 +103502,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -103785,7 +103607,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -103890,7 +103712,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -103995,7 +103817,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -104100,7 +103922,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -104205,7 +104027,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -104310,7 +104132,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -104415,7 +104237,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -104520,7 +104342,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -104625,7 +104447,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -104730,7 +104552,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -104835,7 +104657,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -104940,7 +104762,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -105045,7 +104867,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -105150,7 +104972,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -105255,7 +105077,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -105360,7 +105182,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -105465,7 +105287,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -105570,7 +105392,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -105675,7 +105497,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -105780,7 +105602,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -105885,7 +105707,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -105990,7 +105812,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -106095,7 +105917,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -106200,7 +106022,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -106305,7 +106127,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -106410,7 +106232,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -106515,7 +106337,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -106620,7 +106442,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -106725,7 +106547,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -106830,7 +106652,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -106935,7 +106757,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -107040,7 +106862,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -107145,7 +106967,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -107250,7 +107072,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -107355,7 +107177,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -107460,7 +107282,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -107565,7 +107387,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -107670,7 +107492,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -107775,7 +107597,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -107880,7 +107702,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -107985,7 +107807,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -108090,7 +107912,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -108195,7 +108017,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -108300,7 +108122,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -108405,7 +108227,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -108510,7 +108332,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -108615,7 +108437,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -108720,7 +108542,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -108825,7 +108647,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -108930,7 +108752,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -109035,7 +108857,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -109140,7 +108962,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -109245,7 +109067,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -109350,7 +109172,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -109455,7 +109277,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -109560,7 +109382,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -109665,7 +109487,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -109770,7 +109592,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -109875,7 +109697,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -109980,7 +109802,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -110085,7 +109907,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -110190,7 +110012,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -110295,7 +110117,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -110395,7 +110217,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -110495,7 +110317,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -110595,7 +110417,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -110695,7 +110517,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -110795,7 +110617,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -110895,7 +110717,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -110995,7 +110817,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian",
         "pool:Skia"
       ],
       "env_prefixes": {