diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 178bfd6232..8778275f15 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -299,7 +299,7 @@
         "swarming": {
           "dimensions": {
             "android_devices": "1",
-            "device_type": "walleye",
+            "device_type": "crosshatch",
             "os": "Android"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -752,7 +752,7 @@
         "swarming": {
           "dimensions": {
             "android_devices": "1",
-            "device_type": "walleye",
+            "device_type": "crosshatch",
             "os": "Android"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -1233,7 +1233,7 @@
         "swarming": {
           "dimensions": {
             "android_devices": "1",
-            "device_type": "walleye",
+            "device_type": "crosshatch",
             "os": "Android"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -1686,7 +1686,7 @@
         "swarming": {
           "dimensions": {
             "android_devices": "1",
-            "device_type": "walleye",
+            "device_type": "crosshatch",
             "os": "Android"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 6675457ce8..e3fd2f6224 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -51,6 +51,14 @@
       }
     }
   },
+  'crosshatch': {
+    'swarming': {
+      'dimensions': {
+        'device_type': 'crosshatch',
+        'os': 'Android'
+      }
+    }
+  },
   'fuchsia-gtest-output': {
     'args': [
       '--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json',
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index ded32c10e3..b897284413 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -35,6 +35,14 @@
       }
     }
   },
+  'crosshatch': {
+    'swarming': {
+      'dimensions': {
+        'device_type': 'crosshatch',
+        'os': 'Android',
+      },
+    },
+  },
   # Hack to use the test-launcher-summary-output flag + emulator folders for gtest-output
   # but it's currently the only way to get the file out of the emulator.
   'fuchsia-gtest-output': {
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index 9430d45a39..d898c51d7d 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -42,7 +42,7 @@
       },
       'slow_peer_connection_unittests': {},
       'svc_tests': {
-        'mixins': ['shards-4'],
+        'mixins': ['shards-4', 'crosshatch'],
       },
       'system_wrappers_unittests': {},
       'test_support_unittests': {},
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index c2a17f1357..c7771aec61 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -299,7 +299,7 @@
         "swarming": {
           "dimensions": {
             "android_devices": "1",
-            "device_type": "walleye",
+            "device_type": "crosshatch",
             "os": "Android"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -776,7 +776,7 @@
         "swarming": {
           "dimensions": {
             "android_devices": "1",
-            "device_type": "walleye",
+            "device_type": "crosshatch",
             "os": "Android"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -1253,7 +1253,7 @@
         "swarming": {
           "dimensions": {
             "android_devices": "1",
-            "device_type": "walleye",
+            "device_type": "crosshatch",
             "os": "Android"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -1755,7 +1755,7 @@
         "swarming": {
           "dimensions": {
             "android_devices": "1",
-            "device_type": "walleye",
+            "device_type": "crosshatch",
             "os": "Android"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",