diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index a221d088d5..a52b4b282e 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -234,10 +234,10 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 				"Nexus5":          {"hammerhead", "M4B30Z_3437181"},
 				"Nexus5x":         {"bullhead", "OPR6.170623.023"},
 				"Nexus7":          {"grouper", "LMY47V_1836172"}, // 2012 Nexus 7
-				"NexusPlayer":     {"fugu", "OPR6.170623.021"},
+				"NexusPlayer":     {"fugu", "OPR2.170623.027"},
 				"Pixel":           {"sailfish", "OPM1.171019.016"},
 				"Pixel2XL":        {"taimen", "OPM1.171019.021"},
-				"PixelC":          {"dragon", "OPR1.170623.034"},
+				"PixelC":          {"dragon", "OPM1.171019.026"},
 			}[parts["model"]]
 			if !ok {
 				glog.Fatalf("Entry %q not found in Android mapping.", parts["model"])
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 1cb1998b9d..68bcd204b1 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -7857,7 +7857,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.021",
+        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -7891,7 +7891,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.021",
+        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -7925,7 +7925,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.021",
+        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -7959,7 +7959,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.021",
+        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -7993,7 +7993,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.021",
+        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -8393,7 +8393,7 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:OPR1.170623.034",
+        "device_os:OPM1.171019.026",
         "device_type:dragon",
         "os:Android",
         "pool:Skia"
@@ -8425,7 +8425,7 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:OPR1.170623.034",
+        "device_os:OPM1.171019.026",
         "device_type:dragon",
         "os:Android",
         "pool:Skia"
@@ -8457,7 +8457,7 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:OPR1.170623.034",
+        "device_os:OPM1.171019.026",
         "device_type:dragon",
         "os:Android",
         "pool:Skia"
@@ -16813,7 +16813,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.021",
+        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -16848,7 +16848,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.021",
+        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -16883,7 +16883,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.021",
+        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -16918,7 +16918,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.021",
+        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -16953,7 +16953,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.021",
+        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -16988,7 +16988,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPR6.170623.021",
+        "device_os:OPR2.170623.027",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"