diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 6a3742e8c1..3cc6836d05 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -497,7 +497,7 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 				"GalaxyS7_G930FD": {"herolte", "R16NW_G930FXXS2ERH6"}, // This is Oreo.
 				"GalaxyS9":        {"starlte", "R16NW_G960FXXU2BRJ8"}, // This is Oreo.
 				"MotoG4":          {"athene", "NPJS25.93-14.7-8"},
-				"NVIDIA_Shield":   {"foster", "OPR6.170623.010_2604118_1256.7693"},
+				"NVIDIA_Shield":   {"foster", "OPR6.170623.010_3507953_1441.7411"},
 				"Nexus5":          {"hammerhead", "M4B30Z_3437181"},
 				"Nexus5x":         {"bullhead", "OPR6.170623.023"},
 				"Nexus7":          {"grouper", "LMY47V_1836172"}, // 2012 Nexus 7
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 7282379ea9..b54c0e4f72 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -25366,7 +25366,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -25466,7 +25466,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -25566,7 +25566,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -25666,7 +25666,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -25766,7 +25766,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -49842,7 +49842,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -49942,7 +49942,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -50042,7 +50042,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -50142,7 +50142,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -50242,7 +50242,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -50342,7 +50342,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -50442,7 +50442,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.010_2604118_1256.7693",
+        "device_os:OPR6.170623.010_3507953_1441.7411",
         "device_type:foster",
         "os:Android",
         "pool:Skia"