From 03d6cec0fad917581586e8ddf106d3fc058ea385 Mon Sep 17 00:00:00 2001
From: Csoregi Natalia <ncsoregi@mozilla.com>
Date: Thu, 22 Jul 2021 17:44:50 +0300
Subject: [PATCH] Backed out changeset dfe2d02eb5f6 (bug 1721455) for causing
 geckoview failures. CLOSED TREE

---
 taskcluster/ci/test/browsertime-mobile.yml |   11 +-
 taskcluster/ci/test/compiled.yml           |    6 +-
 taskcluster/ci/test/mochitest.yml          |   21 +-
 taskcluster/ci/test/raptor-gve.yml         |    6 +-
 taskcluster/ci/test/reftest.yml            |   12 +-
 taskcluster/ci/test/test-platforms.yml     |   91 +-
 taskcluster/ci/test/test-sets.yml          |   13 +-
 taskcluster/ci/test/web-platform.yml       |   14 +-
 taskcluster/ci/test/xpcshell.yml           |    4 +-
 taskcluster/taskgraph/transforms/tests.py  |   12 -
 testing/perfdocs/generated/raptor.rst      | 1348 +++++++++++++++++---
 11 files changed, 1279 insertions(+), 259 deletions(-)

diff --git a/taskcluster/ci/test/browsertime-mobile.yml b/taskcluster/ci/test/browsertime-mobile.yml
index efc90680100c..386f7b24342b 100644
--- a/taskcluster/ci/test/browsertime-mobile.yml
+++ b/taskcluster/ci/test/browsertime-mobile.yml
@@ -10,7 +10,7 @@ job-defaults:
             refbrow: []
             default:
                 by-test-platform:
-                    android-hw-p2-.*aarch64-shippable-qr.*: [mozilla-central]
+                    android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central]
                     default: []
     tier: 3
     test-manifest-loader: null  # don't load tests in the taskgraph
@@ -62,7 +62,7 @@ job-defaults:
     limit-platforms:
         by-app:
             chrome-m:
-                - .*shippable-qr.*
+                - .*shippable(?!-qr).*
             default: []
 
 browsertime-tp6m:
@@ -268,6 +268,7 @@ browsertime-tp6m-profiling:
             - --gecko-profile
     run-on-projects:
         by-test-platform:
+            android-hw-p2-.*aarch64-shippable/opt: []
             android-hw-p2-.*aarch64-shippable-qr/opt: [mozilla-central]
             default: []
 
@@ -283,12 +284,13 @@ browsertime-speedometer-mobile:
             refbrow: []
             geckoview:
                 by-test-platform:
+                    android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central]
                     android-hw-g5.*shippable-qr.*: [trunk, mozilla-beta]
                     android-hw-p2.*aarch64-shippable-qr.*: [trunk, mozilla-beta]
                     default: []
             default:
                 by-test-platform:
-                    android-hw-p2-.*aarch64-shippable-qr.*: [mozilla-central]
+                    android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central]
                     default: []
     treeherder-symbol: Btime(sp)
     mozharness:
@@ -305,12 +307,13 @@ browsertime-unity-webgl-mobile:
             refbrow: []
             geckoview:
                 by-test-platform:
+                    android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central]
                     android-hw-g5.*shippable-qr.*: [trunk, mozilla-beta]
                     android-hw-p2.*aarch64-shippable-qr.*: [trunk, mozilla-beta]
                     default: []
             default:
                 by-test-platform:
-                    android-hw-p2-.*aarch64-shippable-qr.*: [mozilla-central]
+                    android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central]
                     default: []
     max-run-time: 900
     mozharness:
diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml
index d626a58746a6..9401527f5eee 100644
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@@ -75,8 +75,8 @@ jittest:
     treeherder-symbol: Jit
     run-on-projects:
         by-test-platform:
-            android-hw-.*-aarch64-qr/debug: ['mozilla-central', 'release']
-            android-hw-.*-arm7-qr/debug: ['mozilla-central', 'release']
+            android-hw-.*-aarch64/debug: ['mozilla-central', 'release']
+            android-hw-.*-arm7/debug: ['mozilla-central', 'release']
             default: built-projects
     chunks:
         by-test-platform:
@@ -114,7 +114,7 @@ jittest-all:
     treeherder-symbol: Jit
     run-on-projects:
         by-test-platform:
-            android-hw-.*-arm7(?:-shippable)?-qr/.*: ['mozilla-central', 'release']
+            android-hw-.*-arm7(?:-shippable)?/.*: ['mozilla-central', 'release']
             default: []
     chunks: 10
     max-run-time: 3600
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index d644e4f8cdce..2640818188e0 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -24,7 +24,7 @@ job-defaults:
                     default: 2
             default:
                 by-test-platform:
-                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    android-em-7.0-x86_64/debug-isolated-process: 3
                     default: default
     mozharness:
         script:
@@ -79,7 +79,7 @@ mochitest-plain:
             default:
                 by-test-platform:
                     .*-tsan/opt: ['trunk']
-                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em-7.0-x86_64/debug-isolated-process: []
                     default: built-projects
     chunks:
         by-test-platform:
@@ -333,7 +333,7 @@ mochitest-plain-gpu:
             default:
                 by-test-platform:
                     .*-tsan/opt: ['trunk']
-                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em-7.0-x86_64/debug-isolated-process: []
                     default: built-projects
     virtualization:
         by-test-platform:
@@ -345,7 +345,7 @@ mochitest-plain-gpu:
             fission: 2
             default:
                 by-test-platform:
-                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    android-em-7.0-x86_64/debug-isolated-process: 3
                     default: default
     mozharness:
         mochitest-flavor: plain
@@ -433,7 +433,7 @@ mochitest-media:
                     windows10-64-asan-qr/opt: ['trunk']
                     android-hw-.*(?<!-shippable)(-qr)?/opt: ['autoland']
                     android-hw-.*-arm7.*/(?:debug)?: ['trunk', 'mozilla-beta', 'mozilla-release']
-                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em-7.0-x86_64/debug-isolated-process: []
                     windows10-aarch64-qr/.*: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
                     (linux|windows10-64|macos)(?!.*-qr).*: []
                     default: built-projects
@@ -449,7 +449,7 @@ mochitest-media:
                 by-test-platform:
                     android-hw-.*/opt: []
                     android-hw-.*-arm7.*/(?:debug)?: ['trunk', 'mozilla-beta', 'mozilla-release']
-                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em-7.0-x86_64/debug-isolated-process: []
                     .*-tsan/opt: ['trunk']
                     linux.*(asan|ccov)/opt: []
                     .*(ccov/|asan/|-32).*: built-projects
@@ -460,6 +460,7 @@ mochitest-media:
         by-test-platform:
             android-em-7.0-x86_64-qr/debug: ['webrender-sw', 'socketprocess', 'fission', 'noqr']
             android-em.*-qr.*: ['fission', 'fission-webgl-ipc', 'webgl-ipc', 'noqr']
+            android-em-7.*: ['fission']
             android-.*/opt: []
             android.*: ['socketprocess']
             .*-ccov-qr.*/.*: ['noqr']
@@ -505,7 +506,7 @@ mochitest-media:
             default:
                 by-test-platform:
                     android-em.*: 1
-                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    android-em-7.0-x86_64/debug-isolated-process: 3
                     windows10-aarch64-qr.*: 2
                     android-hw.*: 1
                     macosx1100.*: 2
@@ -619,7 +620,7 @@ mochitest-webgl1-core:
         by-test-platform:
             .*-tsan/opt: ['trunk']
             android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-            android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
+            android-hw.*aarch.*-shippable/opt: ['mozilla-central']
             default: built-projects
     tier:
         by-test-platform:
@@ -659,7 +660,7 @@ mochitest-webgl1-ext:
         by-test-platform:
             .*-tsan/opt: ['trunk']
             android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-            android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
+            android-hw.*aarch.*-shippable/opt: ['mozilla-central']
             default: built-projects
     tier:
         by-test-platform:
@@ -698,7 +699,7 @@ mochitest-webgl2-core:
         by-test-platform:
             .*-tsan/opt: ['trunk']
             android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-            android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
+            android-hw.*aarch.*-shippable/opt: ['mozilla-central']
             default: built-projects
     tier:
         by-test-platform:
diff --git a/taskcluster/ci/test/raptor-gve.yml b/taskcluster/ci/test/raptor-gve.yml
index 6e15ed383157..71e97a53983b 100644
--- a/taskcluster/ci/test/raptor-gve.yml
+++ b/taskcluster/ci/test/raptor-gve.yml
@@ -7,9 +7,9 @@ job-defaults:
     suite: raptor
     run-on-projects:
         by-test-platform:
-            android-hw-p2-.*-arm7-qr/(?!opt).*: []
-            android-hw-p2-.*-arm7-shippable-qr/opt: []
-            android-hw(?!-p2).*(?<!-arm7-shippable)-qr/opt.*: []
+            android-hw-p2-.*-arm7/(?!opt).*: []
+            android-hw-p2-.*-arm7-shippable/opt: []
+            android-hw(?!-p2).*(?<!-arm7-shippable)/opt.*: []
             default: [mozilla-central]
     target: geckoview_example.apk
     test-manifest-loader: null  # don't load tests in the taskgraph
diff --git a/taskcluster/ci/test/reftest.yml b/taskcluster/ci/test/reftest.yml
index 6e98c3fbb818..4f77d3123bdb 100644
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -74,7 +74,7 @@ crashtest:
             default:
                 by-test-platform:
                     windows10-aarch64-qr/.*: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em-7.0-x86_64/debug-isolated-process: []
                     linux.*asan/opt: []
                     .*(-asan|-tsan|10-32|7-32).*: built-projects
                     android.*: built-projects
@@ -92,7 +92,7 @@ crashtest:
                     windows10-aarch64-qr.*: 2
                     macosx1100.*: 2
                     android-hw-.*-qr/.*: 2
-                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    android-em-7.0-x86_64/debug-isolated-process: 3
                     default: default
 
 crashtest-qr:
@@ -146,8 +146,8 @@ jsreftest:
             fission: []
             default:
                 by-test-platform:
-                    android-hw-.*-aarch64(?:-shippable)?-qr/.*: ['mozilla-central', 'release']
-                    android-hw-.*-arm7(?:-shippable)?-qr/.*: ['mozilla-central', 'release']
+                    android-hw-.*-aarch64(?:-shippable)?/.*: ['mozilla-central', 'release']
+                    android-hw-.*-arm7(?:-shippable)?/.*: ['mozilla-central', 'release']
                     default: built-projects
     virtualization:
         by-test-platform:
@@ -201,7 +201,7 @@ reftest:
             default:
                 by-test-platform:
                     windows10-aarch64-qr/.*: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em-7.0-x86_64/debug-isolated-process: []
                     linux.*asan/opt: []
                     .*(mingwclang|-asan|-tsan|10-32|7-32).*: built-projects
                     windows10-aarch64-qr/opt: built-projects
@@ -233,7 +233,7 @@ reftest:
                     windows10-aarch64-qr.*: 2
                     android-hw-.*-qr/.*: 2
                     macosx1100.*: 2
-                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    android-em-7.0-x86_64/debug-isolated-process: 3
                     default: default
 
 reftest-qr:
diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index 062af2b88457..8d81b9ec95aa 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -413,49 +413,78 @@ macosx1014-64-shippable-qr/opt:
 #
 # android-em test platforms execute on android emulators.
 
-android-em-7.0-x86_64-qr/opt:
+android-em-7.0-x86_64/opt:
     build-platform: android-x86_64/opt
     test-sets:
         - android-x86_64-tests
         - web-platform-tests-backlog
 
-android-em-7.0-x86_64-lite-qr/opt:
+android-em-7.0-x86_64-lite/opt:
     build-platform: android-x86_64-lite/opt
     test-sets:
         - android-x86_64-tests
         - web-platform-tests-backlog
 
-android-em-7.0-x86_64-shippable-qr/opt:
+android-em-7.0-x86_64-shippable/opt:
     build-platform: android-x86_64-shippable/opt
     test-sets:
         - android-x86_64-tests
         - web-platform-tests-backlog
 
-android-em-7.0-x86_64-shippable-lite-qr/opt:
+android-em-7.0-x86_64-shippable-lite/opt:
     build-platform: android-x86_64-shippable-lite/opt
     test-sets:
         - android-x86_64-tests
         - web-platform-tests-backlog
 
-android-em-7.0-x86_64-qr/debug:
+android-em-7.0-x86_64/debug:
     build-platform: android-x86_64/debug
     test-sets:
         - android-x86_64-tests
 
-android-em-7.0-x86_64-lite-qr/debug:
+android-em-7.0-x86_64-lite/debug:
     build-platform: android-x86_64-lite/debug
     test-sets:
         - android-x86_64-tests
 
-android-em-7.0-x86_64-qr/debug-isolated-process:
+android-em-7.0-x86_64/debug-isolated-process:
     build-platform: android-x86_64/debug-isolated-process
     test-sets:
         - android-x86_64-tests
 
+android-em-7.0-x86_64-qr/opt:
+    build-platform: android-x86_64/opt
+    test-sets:
+        - android-x86_64-qr-tests
+
+android-em-7.0-x86_64-shippable-qr/opt:
+    build-platform: android-x86_64-shippable/opt
+    test-sets:
+        - android-x86_64-qr-tests
+
+android-em-7.0-x86_64-qr/debug:
+    build-platform: android-x86_64/debug
+    test-sets:
+        - android-x86_64-qr-tests
+
 # android-hw test platforms execute on real devices attached to Autophone hosts.
 
 # android-hw-g5-7-0 Motorola Moto G5 Android 7.0
 
+android-hw-g5-7-0-arm7/opt:
+    build-platform: android-arm/opt
+    test-sets:
+        - android-hw-browsertime
+        - android-hw-arm7-raptor-cpu-memory
+        - android-hw-arm7-raptor-cpu-memory-power
+
+android-hw-g5-7-0-arm7-shippable/opt:
+    build-platform: android-arm-shippable/opt
+    test-sets:
+        - android-hw-browsertime
+        - android-hw-arm7-raptor-cpu-memory
+        - android-hw-arm7-raptor-cpu-memory-power
+
 android-hw-g5-7-0-arm7-qr/opt:
     build-platform: android-arm/opt
     test-sets:
@@ -472,7 +501,7 @@ android-hw-g5-7-0-arm7-shippable-qr/opt:
 
 # android-hw-p2-8-0 Google Pixel 2 Android 8.0
 
-android-hw-p2-8-0-arm7-qr/opt:
+android-hw-p2-8-0-arm7/opt:
     build-platform: android-arm/opt
     test-sets:
         - android-hw-browsertime
@@ -480,7 +509,7 @@ android-hw-p2-8-0-arm7-qr/opt:
         - android-hw-arm7-raptor-cpu-memory
         - android-hw-arm7-raptor-cpu-memory-power
 
-android-hw-p2-8-0-arm7-shippable-qr/opt:
+android-hw-p2-8-0-arm7-shippable/opt:
     build-platform: android-arm-shippable/opt
     test-sets:
         - android-hw-browsertime
@@ -488,7 +517,7 @@ android-hw-p2-8-0-arm7-shippable-qr/opt:
         - android-hw-arm7-raptor-cpu-memory
         - android-hw-arm7-raptor-cpu-memory-power
 
-android-hw-p2-8-0-arm7-qr/debug:
+android-hw-p2-8-0-arm7/debug:
     build-platform: android-arm/debug
     test-sets:
         - android-hw-arm7-debug-unittests
@@ -496,36 +525,59 @@ android-hw-p2-8-0-arm7-qr/debug:
 android-hw-p2-8-0-android-aarch64-qr/opt:
     build-platform: android-aarch64/opt
     test-sets:
-        - android-hw-aarch64
+        - android-hw-aarch64-qr
         - android-hw-browsertime
-        - android-hw-aarch64-opt-unittests
         - android-hw-aarch64-raptor-cpu-memory
         - android-hw-aarch64-raptor-cpu-memory-power
 
 android-hw-p2-8-0-android-aarch64-shippable-qr/opt:
     build-platform: android-aarch64-shippable/opt
     test-sets:
-        - android-hw-aarch64
+        - android-hw-aarch64-qr
         - android-hw-browsertime
         - android-hw-browsertime-profiling
-        - android-hw-aarch64-pgo-unittests
         - android-hw-aarch64-raptor-cpu-memory
         - android-hw-aarch64-raptor-cpu-memory-power
 
 android-hw-p2-8-0-android-aarch64-qr/debug:
     build-platform: android-aarch64/debug
     test-sets:
-        - android-hw-aarch64
+        - android-hw-aarch64-qr
+
+android-hw-p2-8-0-android-aarch64/opt:
+    build-platform: android-aarch64/opt
+    test-sets:
+        - android-hw-browsertime
+        - android-hw-aarch64-opt-unittests
+        - android-hw-aarch64-raptor-cpu-memory
+        - android-hw-aarch64-raptor-cpu-memory-power
+
+android-hw-p2-8-0-android-aarch64-shippable/opt:
+    build-platform: android-aarch64-shippable/opt
+    test-sets:
+        - android-hw-browsertime
+        - android-hw-aarch64-pgo-unittests
+        - android-hw-aarch64-raptor-cpu-memory
+        - android-hw-aarch64-raptor-cpu-memory-power
+
+android-hw-p2-8-0-android-aarch64/debug:
+    build-platform: android-aarch64/debug
+    test-sets:
         - android-hw-aarch64-debug-unittests
 
 # android-hw-s7-8-0 Samsung Galaxy S7 Android 8.0
 
-android-hw-s7-8-0-arm7-api-16-qr/opt:
+android-hw-s7-8-0-android-aarch64-shippable/opt:
+    build-platform: android-aarch64-shippable/opt
+    test-sets:
+        - android-hw-browsertime
+
+android-hw-s7-8-0-arm7-api-16/opt:
     build-platform: android-api-16/opt
     test-sets:
         - android-hw-browsertime
 
-android-hw-s7-8-0-arm7-api-16-shippable-qr/opt:
+android-hw-s7-8-0-arm7-api-16-shippable/opt:
     build-platform: android-api-16-shippable/opt
     test-sets:
         - android-hw-browsertime
@@ -539,3 +591,8 @@ android-hw-s7-8-0-android-aarch64-shippable-qr/opt:
     build-platform: android-aarch64-shippable/opt
     test-sets:
         - android-hw-browsertime
+
+android-hw-s7-8-0-android-aarch64/opt:
+    build-platform: android-aarch64/opt
+    test-sets:
+        - android-hw-browsertime
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 9d460686f4a3..ac22562f8e1c 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -487,6 +487,17 @@ android-x86_64-tests:
     - web-platform-tests-reftest
     - xpcshell
 
+android-x86_64-qr-tests:
+    - crashtest
+    - geckoview-junit
+    - mochitest-media
+    - mochitest-plain
+    - mochitest-plain-gpu
+    - web-platform-tests
+    - web-platform-tests-crashtest
+    - web-platform-tests-reftest
+    - reftest
+
 android-hw-aarch64-opt-unittests:
     - jittest
 
@@ -502,7 +513,7 @@ android-hw-arm7-debug-unittests:
 android-hw-aarch64-debug-unittests:
     - jittest
 
-android-hw-aarch64:
+android-hw-aarch64-qr:
     - crashtest-qr
     - reftest-qr
     - mochitest-media
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index 245908ee9119..e8c18df77a97 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -33,9 +33,9 @@ job-defaults:
                     - remove_executables.py
     target:
         by-test-platform:
-            android-em-7.0-x86_64-shippable(-lite)?-qr/opt: geckoview-androidTest.apk
-            android-em-7.0-x86_64(-lite)?-qr/opt: geckoview-androidTest.apk
-            android-em-7.0-x86_64(-lite)?-qr/debug(-isolated-process)?: geckoview-androidTest.apk
+            android-em-7.0-x86_64-shippable(-qr|-lite)?/opt: geckoview-androidTest.apk
+            android-em-7.0-x86_64(-qr|-lite)?/opt: geckoview-androidTest.apk
+            android-em-7.0-x86_64(-qr|-lite)?/debug(-isolated-process)?: geckoview-androidTest.apk
             default: null
     python-3: true
 
@@ -57,7 +57,7 @@ web-platform-tests:
                     default: 2
             default:
                 by-test-platform:
-                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    android-em-7.0-x86_64/debug-isolated-process: 3
                     default: default
     chunks:
         by-test-platform:
@@ -94,7 +94,7 @@ web-platform-tests:
                     linux.*-qr/.*: ['release']  # skip on integration branches due to high load, bug 1599197
                     windows.*-qr/.*: ['release']  # skip on integration branches due to high load
                     .*-tsan/opt: ['trunk']
-                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em-7.0-x86_64/debug-isolated-process: []
                     default: built-projects
     mozharness:
         chunked: true
@@ -174,7 +174,7 @@ web-platform-tests-reftest:
             default:
                 by-test-platform:
                     .*-tsan/opt: ['trunk']
-                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em-7.0-x86_64/debug-isolated-process: []
                     default: built-projects
     tier:
         by-variant:
@@ -187,7 +187,7 @@ web-platform-tests-reftest:
             default:
                 by-test-platform:
                     linux1804-64-asan(-qr)?/opt: 2
-                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    android-em-7.0-x86_64/debug-isolated-process: 3
                     default: default
     mozharness:
         extra-options:
diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml
index 2a2757b33837..dba0b97210d8 100644
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -49,7 +49,7 @@ xpcshell:
             default:
                 by-test-platform:
                     .*-tsan/opt: ['trunk']
-                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em-7.0-x86_64/debug-isolated-process: []
                     windows10-64-asan-qr/opt: []  # No XPCShell on ASAN yet
                     default: built-projects
     chunks:
@@ -76,7 +76,7 @@ xpcshell:
                 by-test-platform:
                     windows10-64-asan.*: 3
                     macosx1100.*: 2
-                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    android-em-7.0-x86_64/debug-isolated-process: 3
                     default: default
     fetches:
         toolchain:
diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
index fe8cb4b83a6e..903129fa9d5f 100644
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -934,14 +934,6 @@ def set_treeherder_machine_platform(config, tasks):
             task["treeherder-machine-platform"] = task["test-platform"].replace(
                 ".", "-"
             )
-        elif "android-em-7.0-x86_64-lite-qr" in task["test-platform"]:
-            task["treeherder-machine-platform"] = task["test-platform"].replace(
-                ".", "-"
-            )
-        elif "android-em-7.0-x86_64-shippable-lite-qr" in task["test-platform"]:
-            task["treeherder-machine-platform"] = task["test-platform"].replace(
-                ".", "-"
-            )
         elif "-qr" in task["test-platform"]:
             task["treeherder-machine-platform"] = task["test-platform"]
         elif "android-hw" in task["test-platform"]:
@@ -1462,11 +1454,7 @@ def handle_tier(config, tasks):
                 "android-em-7.0-x86-shippable-lite/opt",
                 "android-em-7.0-x86_64-shippable-qr/opt",
                 "android-em-7.0-x86_64-qr/debug",
-                "android-em-7.0-x86_64-qr/debug-isolated-process",
                 "android-em-7.0-x86_64-qr/opt",
-                "android-em-7.0-x86_64-shippable-lite-qr/opt",
-                "android-em-7.0-x86_64-lite-qr/debug",
-                "android-em-7.0-x86_64-lite-qr/opt",
             ]:
                 task["tier"] = 1
             else:
diff --git a/testing/perfdocs/generated/raptor.rst b/testing/perfdocs/generated/raptor.rst
index 8cafa771bd6d..7ec831fd4713 100644
--- a/testing/perfdocs/generated/raptor.rst
+++ b/testing/perfdocs/generated/raptor.rst
@@ -3265,6 +3265,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-allrecipes-e10s: None
             * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-essential-geckoview-allrecipes-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-allrecipes-e10s: None
+            * browsertime-tp6m-live-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-allrecipes-e10s: None
             * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
             * browsertime-tp6m-essential-geckoview-allrecipes-e10s: mozilla-beta, trunk
@@ -3272,6 +3278,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-allrecipes-e10s: None
             * browsertime-tp6m-live-fenix-allrecipes-e10s: None
             * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-essential-geckoview-allrecipes-e10s: None
+            * browsertime-tp6m-essential-refbrow-allrecipes-e10s: None
+            * browsertime-tp6m-live-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
             * browsertime-tp6m-essential-geckoview-allrecipes-e10s: None
@@ -3279,6 +3291,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-allrecipes-e10s: None
             * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-essential-geckoview-allrecipes-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-allrecipes-e10s: None
+            * browsertime-tp6m-live-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-allrecipes-e10s: None
             * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
             * browsertime-tp6m-essential-geckoview-allrecipes-e10s: mozilla-beta, trunk
@@ -3286,13 +3304,13 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-allrecipes-e10s: None
             * browsertime-tp6m-live-fenix-allrecipes-e10s: None
             * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64/opt
             * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
             * browsertime-tp6m-essential-geckoview-allrecipes-e10s: None
             * browsertime-tp6m-essential-refbrow-allrecipes-e10s: None
             * browsertime-tp6m-live-fenix-allrecipes-e10s: None
             * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-allrecipes-e10s: None
             * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
             * browsertime-tp6m-essential-geckoview-allrecipes-e10s: None
@@ -3300,6 +3318,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-allrecipes-e10s: None
             * browsertime-tp6m-live-fenix-allrecipes-e10s: None
             * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-essential-geckoview-allrecipes-e10s: None
+            * browsertime-tp6m-essential-refbrow-allrecipes-e10s: None
+            * browsertime-tp6m-live-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
             * browsertime-tp6m-essential-geckoview-allrecipes-e10s: None
@@ -3307,6 +3331,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-allrecipes-e10s: None
             * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-essential-geckoview-allrecipes-e10s: None
+            * browsertime-tp6m-essential-refbrow-allrecipes-e10s: None
+            * browsertime-tp6m-live-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-allrecipes-e10s: None
             * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
             * browsertime-tp6m-essential-geckoview-allrecipes-e10s: None
@@ -3314,6 +3344,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-allrecipes-e10s: None
             * browsertime-tp6m-live-fenix-allrecipes-e10s: None
             * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-essential-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-essential-geckoview-allrecipes-e10s: None
+            * browsertime-tp6m-essential-refbrow-allrecipes-e10s: None
+            * browsertime-tp6m-live-fenix-allrecipes-e10s: None
+            * browsertime-tp6m-live-geckoview-allrecipes-e10s: None
 
 
 .. dropdown:: amazon (BT, GV, FE, RB, CH-M)
@@ -3343,13 +3379,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-amazon-e10s: None
             * browsertime-tp6m-refbrow-amazon-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-amazon-e10s: None
             * browsertime-tp6m-fenix-amazon-e10s: None
             * browsertime-tp6m-geckoview-amazon-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-amazon-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-e10s: None
+            * browsertime-tp6m-refbrow-amazon-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-amazon-e10s: None
+            * browsertime-tp6m-fenix-amazon-e10s: None
+            * browsertime-tp6m-geckoview-amazon-e10s: None
             * browsertime-tp6m-live-chrome-m-amazon-e10s: None
             * browsertime-tp6m-live-fenix-amazon-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-e10s: None
             * browsertime-tp6m-refbrow-amazon-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-amazon-e10s: None
+            * browsertime-tp6m-geckoview-amazon-e10s: None
+            * browsertime-tp6m-live-fenix-amazon-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-e10s: None
+            * browsertime-tp6m-refbrow-amazon-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-amazon-e10s: None
             * browsertime-tp6m-geckoview-amazon-e10s: None
@@ -3357,21 +3405,27 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-amazon-e10s: None
             * browsertime-tp6m-refbrow-amazon-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-amazon-e10s: None
             * browsertime-tp6m-fenix-amazon-e10s: None
             * browsertime-tp6m-geckoview-amazon-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-amazon-e10s: None
             * browsertime-tp6m-live-fenix-amazon-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-e10s: None
             * browsertime-tp6m-profiling-geckoview-amazon-e10s: mozilla-central
             * browsertime-tp6m-refbrow-amazon-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
+            * browsertime-tp6m-chrome-m-amazon-e10s: None
+            * browsertime-tp6m-fenix-amazon-e10s: None
+            * browsertime-tp6m-geckoview-amazon-e10s: None
+            * browsertime-tp6m-live-chrome-m-amazon-e10s: None
+            * browsertime-tp6m-live-fenix-amazon-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-e10s: None
+            * browsertime-tp6m-refbrow-amazon-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
             * browsertime-tp6m-fenix-amazon-e10s: None
             * browsertime-tp6m-geckoview-amazon-e10s: None
             * browsertime-tp6m-live-fenix-amazon-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-e10s: None
             * browsertime-tp6m-refbrow-amazon-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-arm7-shippable/opt
             * browsertime-tp6m-chrome-m-amazon-e10s: None
             * browsertime-tp6m-fenix-amazon-e10s: None
             * browsertime-tp6m-geckoview-amazon-e10s: None
@@ -3379,6 +3433,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-amazon-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-e10s: None
             * browsertime-tp6m-refbrow-amazon-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-amazon-e10s: None
+            * browsertime-tp6m-geckoview-amazon-e10s: None
+            * browsertime-tp6m-live-fenix-amazon-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-e10s: None
+            * browsertime-tp6m-refbrow-amazon-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-amazon-e10s: None
             * browsertime-tp6m-geckoview-amazon-e10s: None
@@ -3386,6 +3446,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-amazon-e10s: None
             * browsertime-tp6m-refbrow-amazon-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-amazon-e10s: None
+            * browsertime-tp6m-geckoview-amazon-e10s: None
+            * browsertime-tp6m-live-fenix-amazon-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-e10s: None
+            * browsertime-tp6m-refbrow-amazon-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-amazon-e10s: None
             * browsertime-tp6m-fenix-amazon-e10s: None
             * browsertime-tp6m-geckoview-amazon-e10s: None
@@ -3393,6 +3459,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-amazon-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-e10s: None
             * browsertime-tp6m-refbrow-amazon-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-amazon-e10s: None
+            * browsertime-tp6m-geckoview-amazon-e10s: None
+            * browsertime-tp6m-live-fenix-amazon-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-e10s: None
+            * browsertime-tp6m-refbrow-amazon-e10s: None
 
 
 .. dropdown:: amazon-search (BT, GV, FE, RB, CH-M)
@@ -3422,6 +3494,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-amazon-search-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-essential-geckoview-amazon-search-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-amazon-search-e10s: None
+            * browsertime-tp6m-live-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-amazon-search-e10s: None
             * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
             * browsertime-tp6m-essential-geckoview-amazon-search-e10s: mozilla-beta, trunk
@@ -3429,6 +3507,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-amazon-search-e10s: None
             * browsertime-tp6m-live-fenix-amazon-search-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-essential-geckoview-amazon-search-e10s: None
+            * browsertime-tp6m-essential-refbrow-amazon-search-e10s: None
+            * browsertime-tp6m-live-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
             * browsertime-tp6m-essential-geckoview-amazon-search-e10s: None
@@ -3436,6 +3520,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-amazon-search-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-essential-geckoview-amazon-search-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-amazon-search-e10s: None
+            * browsertime-tp6m-live-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-amazon-search-e10s: None
             * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
             * browsertime-tp6m-essential-geckoview-amazon-search-e10s: mozilla-beta, trunk
@@ -3443,13 +3533,13 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-amazon-search-e10s: None
             * browsertime-tp6m-live-fenix-amazon-search-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64/opt
             * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
             * browsertime-tp6m-essential-geckoview-amazon-search-e10s: None
             * browsertime-tp6m-essential-refbrow-amazon-search-e10s: None
             * browsertime-tp6m-live-fenix-amazon-search-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-amazon-search-e10s: None
             * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
             * browsertime-tp6m-essential-geckoview-amazon-search-e10s: None
@@ -3457,6 +3547,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-amazon-search-e10s: None
             * browsertime-tp6m-live-fenix-amazon-search-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-essential-geckoview-amazon-search-e10s: None
+            * browsertime-tp6m-essential-refbrow-amazon-search-e10s: None
+            * browsertime-tp6m-live-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
             * browsertime-tp6m-essential-geckoview-amazon-search-e10s: None
@@ -3464,6 +3560,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-amazon-search-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-essential-geckoview-amazon-search-e10s: None
+            * browsertime-tp6m-essential-refbrow-amazon-search-e10s: None
+            * browsertime-tp6m-live-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-amazon-search-e10s: None
             * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
             * browsertime-tp6m-essential-geckoview-amazon-search-e10s: None
@@ -3471,6 +3573,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-amazon-search-e10s: None
             * browsertime-tp6m-live-fenix-amazon-search-e10s: None
             * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-essential-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-essential-geckoview-amazon-search-e10s: None
+            * browsertime-tp6m-essential-refbrow-amazon-search-e10s: None
+            * browsertime-tp6m-live-fenix-amazon-search-e10s: None
+            * browsertime-tp6m-live-geckoview-amazon-search-e10s: None
 
 
 .. dropdown:: bing (BT, GV, FE, RB, CH-M)
@@ -3500,13 +3608,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-bing-e10s: None
             * browsertime-tp6m-refbrow-bing-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-bing-e10s: None
             * browsertime-tp6m-fenix-bing-e10s: None
             * browsertime-tp6m-geckoview-bing-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-bing-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-e10s: None
+            * browsertime-tp6m-refbrow-bing-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-bing-e10s: None
+            * browsertime-tp6m-fenix-bing-e10s: None
+            * browsertime-tp6m-geckoview-bing-e10s: None
             * browsertime-tp6m-live-chrome-m-bing-e10s: None
             * browsertime-tp6m-live-fenix-bing-e10s: None
             * browsertime-tp6m-live-geckoview-bing-e10s: None
             * browsertime-tp6m-refbrow-bing-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-bing-e10s: None
+            * browsertime-tp6m-geckoview-bing-e10s: None
+            * browsertime-tp6m-live-fenix-bing-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-e10s: None
+            * browsertime-tp6m-refbrow-bing-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-bing-e10s: None
             * browsertime-tp6m-geckoview-bing-e10s: None
@@ -3514,20 +3634,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-bing-e10s: None
             * browsertime-tp6m-refbrow-bing-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-bing-e10s: None
             * browsertime-tp6m-fenix-bing-e10s: None
             * browsertime-tp6m-geckoview-bing-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-bing-e10s: None
             * browsertime-tp6m-live-fenix-bing-e10s: None
             * browsertime-tp6m-live-geckoview-bing-e10s: None
             * browsertime-tp6m-refbrow-bing-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-bing-e10s: None
-            * browsertime-tp6m-geckoview-bing-e10s: None
-            * browsertime-tp6m-live-fenix-bing-e10s: None
-            * browsertime-tp6m-live-geckoview-bing-e10s: None
-            * browsertime-tp6m-refbrow-bing-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-bing-e10s: None
             * browsertime-tp6m-fenix-bing-e10s: None
             * browsertime-tp6m-geckoview-bing-e10s: None
@@ -3535,6 +3647,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-bing-e10s: None
             * browsertime-tp6m-live-geckoview-bing-e10s: None
             * browsertime-tp6m-refbrow-bing-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-bing-e10s: None
+            * browsertime-tp6m-geckoview-bing-e10s: None
+            * browsertime-tp6m-live-fenix-bing-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-e10s: None
+            * browsertime-tp6m-refbrow-bing-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-bing-e10s: None
+            * browsertime-tp6m-fenix-bing-e10s: None
+            * browsertime-tp6m-geckoview-bing-e10s: None
+            * browsertime-tp6m-live-chrome-m-bing-e10s: None
+            * browsertime-tp6m-live-fenix-bing-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-e10s: None
+            * browsertime-tp6m-refbrow-bing-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-bing-e10s: None
+            * browsertime-tp6m-geckoview-bing-e10s: None
+            * browsertime-tp6m-live-fenix-bing-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-e10s: None
+            * browsertime-tp6m-refbrow-bing-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-bing-e10s: None
             * browsertime-tp6m-geckoview-bing-e10s: None
@@ -3542,6 +3674,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-bing-e10s: None
             * browsertime-tp6m-refbrow-bing-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-bing-e10s: None
+            * browsertime-tp6m-geckoview-bing-e10s: None
+            * browsertime-tp6m-live-fenix-bing-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-e10s: None
+            * browsertime-tp6m-refbrow-bing-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-bing-e10s: None
             * browsertime-tp6m-fenix-bing-e10s: None
             * browsertime-tp6m-geckoview-bing-e10s: None
@@ -3549,6 +3687,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-bing-e10s: None
             * browsertime-tp6m-live-geckoview-bing-e10s: None
             * browsertime-tp6m-refbrow-bing-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-bing-e10s: None
+            * browsertime-tp6m-geckoview-bing-e10s: None
+            * browsertime-tp6m-live-fenix-bing-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-e10s: None
+            * browsertime-tp6m-refbrow-bing-e10s: None
 
 
 .. dropdown:: bing-search-restaurants (BT, GV, FE, RB, CH-M)
@@ -3578,13 +3722,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-bing-search-restaurants-e10s: None
             * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
             * browsertime-tp6m-live-chrome-m-bing-search-restaurants-e10s: None
             * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
             * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
@@ -3592,20 +3748,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-bing-search-restaurants-e10s: None
             * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-bing-search-restaurants-e10s: None
             * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
             * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
-            * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
-            * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
-            * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
-            * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-bing-search-restaurants-e10s: None
             * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
@@ -3613,6 +3761,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
             * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-chrome-m-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
@@ -3620,6 +3788,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-bing-search-restaurants-e10s: None
             * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
@@ -3627,6 +3801,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
             * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-bing-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-bing-search-restaurants-e10s: None
 
 
 .. dropdown:: booking (BT, GV, FE, RB, CH-M)
@@ -3656,13 +3836,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-booking-e10s: None
             * browsertime-tp6m-refbrow-booking-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-booking-e10s: None
             * browsertime-tp6m-fenix-booking-e10s: None
             * browsertime-tp6m-geckoview-booking-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-booking-e10s: None
+            * browsertime-tp6m-live-geckoview-booking-e10s: None
+            * browsertime-tp6m-refbrow-booking-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-booking-e10s: None
+            * browsertime-tp6m-fenix-booking-e10s: None
+            * browsertime-tp6m-geckoview-booking-e10s: None
             * browsertime-tp6m-live-chrome-m-booking-e10s: None
             * browsertime-tp6m-live-fenix-booking-e10s: None
             * browsertime-tp6m-live-geckoview-booking-e10s: None
             * browsertime-tp6m-refbrow-booking-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-booking-e10s: None
+            * browsertime-tp6m-geckoview-booking-e10s: None
+            * browsertime-tp6m-live-fenix-booking-e10s: None
+            * browsertime-tp6m-live-geckoview-booking-e10s: None
+            * browsertime-tp6m-refbrow-booking-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-booking-e10s: None
             * browsertime-tp6m-geckoview-booking-e10s: None
@@ -3670,20 +3862,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-booking-e10s: None
             * browsertime-tp6m-refbrow-booking-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-booking-e10s: None
             * browsertime-tp6m-fenix-booking-e10s: None
             * browsertime-tp6m-geckoview-booking-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-booking-e10s: None
             * browsertime-tp6m-live-fenix-booking-e10s: None
             * browsertime-tp6m-live-geckoview-booking-e10s: None
             * browsertime-tp6m-refbrow-booking-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-booking-e10s: None
-            * browsertime-tp6m-geckoview-booking-e10s: None
-            * browsertime-tp6m-live-fenix-booking-e10s: None
-            * browsertime-tp6m-live-geckoview-booking-e10s: None
-            * browsertime-tp6m-refbrow-booking-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-booking-e10s: None
             * browsertime-tp6m-fenix-booking-e10s: None
             * browsertime-tp6m-geckoview-booking-e10s: None
@@ -3691,6 +3875,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-booking-e10s: None
             * browsertime-tp6m-live-geckoview-booking-e10s: None
             * browsertime-tp6m-refbrow-booking-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-booking-e10s: None
+            * browsertime-tp6m-geckoview-booking-e10s: None
+            * browsertime-tp6m-live-fenix-booking-e10s: None
+            * browsertime-tp6m-live-geckoview-booking-e10s: None
+            * browsertime-tp6m-refbrow-booking-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-booking-e10s: None
+            * browsertime-tp6m-fenix-booking-e10s: None
+            * browsertime-tp6m-geckoview-booking-e10s: None
+            * browsertime-tp6m-live-chrome-m-booking-e10s: None
+            * browsertime-tp6m-live-fenix-booking-e10s: None
+            * browsertime-tp6m-live-geckoview-booking-e10s: None
+            * browsertime-tp6m-refbrow-booking-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-booking-e10s: None
+            * browsertime-tp6m-geckoview-booking-e10s: None
+            * browsertime-tp6m-live-fenix-booking-e10s: None
+            * browsertime-tp6m-live-geckoview-booking-e10s: None
+            * browsertime-tp6m-refbrow-booking-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-booking-e10s: None
             * browsertime-tp6m-geckoview-booking-e10s: None
@@ -3698,6 +3902,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-booking-e10s: None
             * browsertime-tp6m-refbrow-booking-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-booking-e10s: None
+            * browsertime-tp6m-geckoview-booking-e10s: None
+            * browsertime-tp6m-live-fenix-booking-e10s: None
+            * browsertime-tp6m-live-geckoview-booking-e10s: None
+            * browsertime-tp6m-refbrow-booking-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-booking-e10s: None
             * browsertime-tp6m-fenix-booking-e10s: None
             * browsertime-tp6m-geckoview-booking-e10s: None
@@ -3705,6 +3915,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-booking-e10s: None
             * browsertime-tp6m-live-geckoview-booking-e10s: None
             * browsertime-tp6m-refbrow-booking-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-booking-e10s: None
+            * browsertime-tp6m-geckoview-booking-e10s: None
+            * browsertime-tp6m-live-fenix-booking-e10s: None
+            * browsertime-tp6m-live-geckoview-booking-e10s: None
+            * browsertime-tp6m-refbrow-booking-e10s: None
 
 
 .. dropdown:: cnn (BT, GV, FE, RB, CH-M)
@@ -3734,13 +3950,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-cnn-e10s: None
             * browsertime-tp6m-refbrow-cnn-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-cnn-e10s: None
             * browsertime-tp6m-fenix-cnn-e10s: None
             * browsertime-tp6m-geckoview-cnn-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-cnn-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-e10s: None
+            * browsertime-tp6m-refbrow-cnn-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-cnn-e10s: None
+            * browsertime-tp6m-fenix-cnn-e10s: None
+            * browsertime-tp6m-geckoview-cnn-e10s: None
             * browsertime-tp6m-live-chrome-m-cnn-e10s: None
             * browsertime-tp6m-live-fenix-cnn-e10s: None
             * browsertime-tp6m-live-geckoview-cnn-e10s: None
             * browsertime-tp6m-refbrow-cnn-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-cnn-e10s: None
+            * browsertime-tp6m-geckoview-cnn-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-e10s: None
+            * browsertime-tp6m-refbrow-cnn-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-cnn-e10s: None
             * browsertime-tp6m-geckoview-cnn-e10s: None
@@ -3748,20 +3976,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-cnn-e10s: None
             * browsertime-tp6m-refbrow-cnn-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-cnn-e10s: None
             * browsertime-tp6m-fenix-cnn-e10s: None
             * browsertime-tp6m-geckoview-cnn-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-cnn-e10s: None
             * browsertime-tp6m-live-fenix-cnn-e10s: None
             * browsertime-tp6m-live-geckoview-cnn-e10s: None
             * browsertime-tp6m-refbrow-cnn-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-cnn-e10s: None
-            * browsertime-tp6m-geckoview-cnn-e10s: None
-            * browsertime-tp6m-live-fenix-cnn-e10s: None
-            * browsertime-tp6m-live-geckoview-cnn-e10s: None
-            * browsertime-tp6m-refbrow-cnn-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-cnn-e10s: None
             * browsertime-tp6m-fenix-cnn-e10s: None
             * browsertime-tp6m-geckoview-cnn-e10s: None
@@ -3769,6 +3989,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-cnn-e10s: None
             * browsertime-tp6m-live-geckoview-cnn-e10s: None
             * browsertime-tp6m-refbrow-cnn-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-cnn-e10s: None
+            * browsertime-tp6m-geckoview-cnn-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-e10s: None
+            * browsertime-tp6m-refbrow-cnn-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-cnn-e10s: None
+            * browsertime-tp6m-fenix-cnn-e10s: None
+            * browsertime-tp6m-geckoview-cnn-e10s: None
+            * browsertime-tp6m-live-chrome-m-cnn-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-e10s: None
+            * browsertime-tp6m-refbrow-cnn-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-cnn-e10s: None
+            * browsertime-tp6m-geckoview-cnn-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-e10s: None
+            * browsertime-tp6m-refbrow-cnn-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-cnn-e10s: None
             * browsertime-tp6m-geckoview-cnn-e10s: None
@@ -3776,6 +4016,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-cnn-e10s: None
             * browsertime-tp6m-refbrow-cnn-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-cnn-e10s: None
+            * browsertime-tp6m-geckoview-cnn-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-e10s: None
+            * browsertime-tp6m-refbrow-cnn-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-cnn-e10s: None
             * browsertime-tp6m-fenix-cnn-e10s: None
             * browsertime-tp6m-geckoview-cnn-e10s: None
@@ -3783,6 +4029,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-cnn-e10s: None
             * browsertime-tp6m-live-geckoview-cnn-e10s: None
             * browsertime-tp6m-refbrow-cnn-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-cnn-e10s: None
+            * browsertime-tp6m-geckoview-cnn-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-e10s: None
+            * browsertime-tp6m-refbrow-cnn-e10s: None
 
 
 .. dropdown:: cnn-ampstories (BT, GV, FE, RB, CH-M)
@@ -3812,13 +4064,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
             * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-cnn-ampstories-e10s: None
             * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-geckoview-cnn-ampstories-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-cnn-ampstories-e10s: None
             * browsertime-tp6m-live-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: autoland
             * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-cnn-ampstories-e10s: None
+            * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-chrome-m-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-geckoview-cnn-ampstories-e10s: None
@@ -3826,20 +4090,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
             * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-cnn-ampstories-e10s: None
             * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-geckoview-cnn-ampstories-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-cnn-ampstories-e10s: None
             * browsertime-tp6m-live-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: autoland
             * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
+            * browsertime-tp6m-chrome-m-cnn-ampstories-e10s: None
+            * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-chrome-m-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
             * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-geckoview-cnn-ampstories-e10s: None
             * browsertime-tp6m-live-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
             * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-arm7-shippable/opt
             * browsertime-tp6m-chrome-m-cnn-ampstories-e10s: None
             * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-geckoview-cnn-ampstories-e10s: None
@@ -3847,6 +4117,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
             * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-geckoview-cnn-ampstories-e10s: None
@@ -3854,6 +4130,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
             * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-cnn-ampstories-e10s: None
             * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-geckoview-cnn-ampstories-e10s: None
@@ -3861,6 +4143,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-cnn-ampstories-e10s: None
             * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
             * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-fenix-cnn-ampstories-e10s: None
+            * browsertime-tp6m-live-geckoview-cnn-ampstories-e10s: None
+            * browsertime-tp6m-refbrow-cnn-ampstories-e10s: None
 
 
 .. dropdown:: dailymail (BT, GV, FE, RB, CH-M)
@@ -3890,13 +4178,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-dailymail-e10s: None
             * browsertime-tp6m-refbrow-dailymail-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-dailymail-e10s: None
             * browsertime-tp6m-fenix-dailymail-e10s: None
             * browsertime-tp6m-geckoview-dailymail-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-dailymail-e10s: None
+            * browsertime-tp6m-live-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-refbrow-dailymail-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-dailymail-e10s: None
+            * browsertime-tp6m-fenix-dailymail-e10s: None
+            * browsertime-tp6m-geckoview-dailymail-e10s: None
             * browsertime-tp6m-live-chrome-m-dailymail-e10s: None
             * browsertime-tp6m-live-fenix-dailymail-e10s: None
             * browsertime-tp6m-live-geckoview-dailymail-e10s: None
             * browsertime-tp6m-refbrow-dailymail-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-dailymail-e10s: None
+            * browsertime-tp6m-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-live-fenix-dailymail-e10s: None
+            * browsertime-tp6m-live-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-refbrow-dailymail-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-dailymail-e10s: None
             * browsertime-tp6m-geckoview-dailymail-e10s: None
@@ -3904,20 +4204,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-dailymail-e10s: None
             * browsertime-tp6m-refbrow-dailymail-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-dailymail-e10s: None
             * browsertime-tp6m-fenix-dailymail-e10s: None
             * browsertime-tp6m-geckoview-dailymail-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-dailymail-e10s: None
             * browsertime-tp6m-live-fenix-dailymail-e10s: None
             * browsertime-tp6m-live-geckoview-dailymail-e10s: None
             * browsertime-tp6m-refbrow-dailymail-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-dailymail-e10s: None
-            * browsertime-tp6m-geckoview-dailymail-e10s: None
-            * browsertime-tp6m-live-fenix-dailymail-e10s: None
-            * browsertime-tp6m-live-geckoview-dailymail-e10s: None
-            * browsertime-tp6m-refbrow-dailymail-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-dailymail-e10s: None
             * browsertime-tp6m-fenix-dailymail-e10s: None
             * browsertime-tp6m-geckoview-dailymail-e10s: None
@@ -3925,6 +4217,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-dailymail-e10s: None
             * browsertime-tp6m-live-geckoview-dailymail-e10s: None
             * browsertime-tp6m-refbrow-dailymail-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-dailymail-e10s: None
+            * browsertime-tp6m-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-live-fenix-dailymail-e10s: None
+            * browsertime-tp6m-live-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-refbrow-dailymail-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-dailymail-e10s: None
+            * browsertime-tp6m-fenix-dailymail-e10s: None
+            * browsertime-tp6m-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-live-chrome-m-dailymail-e10s: None
+            * browsertime-tp6m-live-fenix-dailymail-e10s: None
+            * browsertime-tp6m-live-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-refbrow-dailymail-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-dailymail-e10s: None
+            * browsertime-tp6m-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-live-fenix-dailymail-e10s: None
+            * browsertime-tp6m-live-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-refbrow-dailymail-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-dailymail-e10s: None
             * browsertime-tp6m-geckoview-dailymail-e10s: None
@@ -3932,6 +4244,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-dailymail-e10s: None
             * browsertime-tp6m-refbrow-dailymail-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-dailymail-e10s: None
+            * browsertime-tp6m-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-live-fenix-dailymail-e10s: None
+            * browsertime-tp6m-live-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-refbrow-dailymail-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-dailymail-e10s: None
             * browsertime-tp6m-fenix-dailymail-e10s: None
             * browsertime-tp6m-geckoview-dailymail-e10s: None
@@ -3939,6 +4257,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-dailymail-e10s: None
             * browsertime-tp6m-live-geckoview-dailymail-e10s: None
             * browsertime-tp6m-refbrow-dailymail-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-dailymail-e10s: None
+            * browsertime-tp6m-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-live-fenix-dailymail-e10s: None
+            * browsertime-tp6m-live-geckoview-dailymail-e10s: None
+            * browsertime-tp6m-refbrow-dailymail-e10s: None
 
 
 .. dropdown:: ebay-kleinanzeigen (BT, GV, FE, RB, CH-M)
@@ -3968,13 +4292,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-live-chrome-m-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
@@ -3982,20 +4318,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
-            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
-            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
-            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
-            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
@@ -4003,6 +4331,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-chrome-m-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
@@ -4010,6 +4358,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
@@ -4017,6 +4371,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-e10s: None
 
 
 .. dropdown:: ebay-kleinanzeigen-search (BT, GV, FE, RB, CH-M)
@@ -4046,13 +4406,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-live-chrome-m-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
@@ -4060,20 +4432,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
-            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
-            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
-            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
-            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
@@ -4081,6 +4445,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-chrome-m-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
@@ -4088,6 +4472,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
@@ -4095,6 +4485,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
             * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-fenix-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-live-geckoview-ebay-kleinanzeigen-search-e10s: None
+            * browsertime-tp6m-refbrow-ebay-kleinanzeigen-search-e10s: None
 
 
 .. dropdown:: espn (BT, GV, FE, RB, CH-M)
@@ -4124,6 +4520,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-espn-e10s: None
             * browsertime-tp6m-live-geckoview-espn-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-espn-e10s: None
+            * browsertime-tp6m-essential-geckoview-espn-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-espn-e10s: None
+            * browsertime-tp6m-live-fenix-espn-e10s: None
+            * browsertime-tp6m-live-geckoview-espn-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-espn-e10s: None
             * browsertime-tp6m-essential-fenix-espn-e10s: None
             * browsertime-tp6m-essential-geckoview-espn-e10s: mozilla-beta, trunk
@@ -4131,6 +4533,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-espn-e10s: None
             * browsertime-tp6m-live-fenix-espn-e10s: None
             * browsertime-tp6m-live-geckoview-espn-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-espn-e10s: None
+            * browsertime-tp6m-essential-geckoview-espn-e10s: None
+            * browsertime-tp6m-essential-refbrow-espn-e10s: None
+            * browsertime-tp6m-live-fenix-espn-e10s: None
+            * browsertime-tp6m-live-geckoview-espn-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-espn-e10s: None
             * browsertime-tp6m-essential-geckoview-espn-e10s: None
@@ -4138,6 +4546,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-espn-e10s: None
             * browsertime-tp6m-live-geckoview-espn-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-espn-e10s: None
+            * browsertime-tp6m-essential-geckoview-espn-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-espn-e10s: None
+            * browsertime-tp6m-live-fenix-espn-e10s: None
+            * browsertime-tp6m-live-geckoview-espn-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-espn-e10s: None
             * browsertime-tp6m-essential-fenix-espn-e10s: None
             * browsertime-tp6m-essential-geckoview-espn-e10s: mozilla-beta, trunk
@@ -4145,13 +4559,13 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-espn-e10s: None
             * browsertime-tp6m-live-fenix-espn-e10s: None
             * browsertime-tp6m-live-geckoview-espn-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64/opt
             * browsertime-tp6m-essential-fenix-espn-e10s: None
             * browsertime-tp6m-essential-geckoview-espn-e10s: None
             * browsertime-tp6m-essential-refbrow-espn-e10s: None
             * browsertime-tp6m-live-fenix-espn-e10s: None
             * browsertime-tp6m-live-geckoview-espn-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-espn-e10s: None
             * browsertime-tp6m-essential-fenix-espn-e10s: None
             * browsertime-tp6m-essential-geckoview-espn-e10s: None
@@ -4159,6 +4573,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-espn-e10s: None
             * browsertime-tp6m-live-fenix-espn-e10s: None
             * browsertime-tp6m-live-geckoview-espn-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-espn-e10s: None
+            * browsertime-tp6m-essential-geckoview-espn-e10s: None
+            * browsertime-tp6m-essential-refbrow-espn-e10s: None
+            * browsertime-tp6m-live-fenix-espn-e10s: None
+            * browsertime-tp6m-live-geckoview-espn-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-espn-e10s: None
             * browsertime-tp6m-essential-geckoview-espn-e10s: None
@@ -4166,6 +4586,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-espn-e10s: None
             * browsertime-tp6m-live-geckoview-espn-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-espn-e10s: None
+            * browsertime-tp6m-essential-geckoview-espn-e10s: None
+            * browsertime-tp6m-essential-refbrow-espn-e10s: None
+            * browsertime-tp6m-live-fenix-espn-e10s: None
+            * browsertime-tp6m-live-geckoview-espn-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-espn-e10s: None
             * browsertime-tp6m-essential-fenix-espn-e10s: None
             * browsertime-tp6m-essential-geckoview-espn-e10s: None
@@ -4173,6 +4599,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-espn-e10s: None
             * browsertime-tp6m-live-fenix-espn-e10s: None
             * browsertime-tp6m-live-geckoview-espn-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-essential-fenix-espn-e10s: None
+            * browsertime-tp6m-essential-geckoview-espn-e10s: None
+            * browsertime-tp6m-essential-refbrow-espn-e10s: None
+            * browsertime-tp6m-live-fenix-espn-e10s: None
+            * browsertime-tp6m-live-geckoview-espn-e10s: None
 
 
 .. dropdown:: facebook (BT, GV, FE, RB, CH-M)
@@ -4203,6 +4635,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-facebook-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-facebook-e10s: None
+            * browsertime-tp6m-essential-geckoview-facebook-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-facebook-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-facebook-e10s: None
             * browsertime-tp6m-essential-fenix-facebook-e10s: None
             * browsertime-tp6m-essential-geckoview-facebook-e10s: mozilla-beta, trunk
@@ -4210,6 +4648,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-facebook-e10s: None
             * browsertime-tp6m-live-fenix-facebook-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-facebook-e10s: None
+            * browsertime-tp6m-essential-geckoview-facebook-e10s: None
+            * browsertime-tp6m-essential-refbrow-facebook-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-facebook-e10s: None
             * browsertime-tp6m-essential-geckoview-facebook-e10s: None
@@ -4217,6 +4661,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-facebook-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-facebook-e10s: None
+            * browsertime-tp6m-essential-geckoview-facebook-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-facebook-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-facebook-e10s: None
             * browsertime-tp6m-essential-fenix-facebook-e10s: None
             * browsertime-tp6m-essential-geckoview-facebook-e10s: mozilla-beta, trunk
@@ -4224,13 +4674,13 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-facebook-e10s: None
             * browsertime-tp6m-live-fenix-facebook-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64/opt
             * browsertime-tp6m-essential-fenix-facebook-e10s: None
             * browsertime-tp6m-essential-geckoview-facebook-e10s: None
             * browsertime-tp6m-essential-refbrow-facebook-e10s: None
             * browsertime-tp6m-live-fenix-facebook-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-facebook-e10s: None
             * browsertime-tp6m-essential-fenix-facebook-e10s: None
             * browsertime-tp6m-essential-geckoview-facebook-e10s: None
@@ -4238,6 +4688,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-facebook-e10s: None
             * browsertime-tp6m-live-fenix-facebook-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-facebook-e10s: None
+            * browsertime-tp6m-essential-geckoview-facebook-e10s: None
+            * browsertime-tp6m-essential-refbrow-facebook-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-facebook-e10s: None
             * browsertime-tp6m-essential-geckoview-facebook-e10s: None
@@ -4245,6 +4701,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-facebook-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-facebook-e10s: None
+            * browsertime-tp6m-essential-geckoview-facebook-e10s: None
+            * browsertime-tp6m-essential-refbrow-facebook-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-facebook-e10s: None
             * browsertime-tp6m-essential-fenix-facebook-e10s: None
             * browsertime-tp6m-essential-geckoview-facebook-e10s: None
@@ -4252,6 +4714,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-facebook-e10s: None
             * browsertime-tp6m-live-fenix-facebook-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-essential-fenix-facebook-e10s: None
+            * browsertime-tp6m-essential-geckoview-facebook-e10s: None
+            * browsertime-tp6m-essential-refbrow-facebook-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-e10s: None
 
 
 .. dropdown:: facebook-cristiano (BT, GV, FE, RB, CH-M)
@@ -4281,13 +4749,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
             * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-facebook-cristiano-e10s: None
             * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
             * browsertime-tp6m-geckoview-facebook-cristiano-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-facebook-cristiano-e10s: None
+            * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
             * browsertime-tp6m-live-chrome-m-facebook-cristiano-e10s: None
             * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
             * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
             * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
@@ -4295,20 +4775,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
             * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-facebook-cristiano-e10s: None
             * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
             * browsertime-tp6m-geckoview-facebook-cristiano-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-facebook-cristiano-e10s: None
             * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
             * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
-            * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
-            * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
-            * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
-            * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-facebook-cristiano-e10s: None
             * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
             * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
@@ -4316,6 +4788,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
             * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-facebook-cristiano-e10s: None
+            * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-chrome-m-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
             * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
@@ -4323,6 +4815,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
             * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-facebook-cristiano-e10s: None
             * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
             * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
@@ -4330,6 +4828,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
             * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
             * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-fenix-facebook-cristiano-e10s: None
+            * browsertime-tp6m-live-geckoview-facebook-cristiano-e10s: None
+            * browsertime-tp6m-refbrow-facebook-cristiano-e10s: None
 
 
 .. dropdown:: google (BT, GV, FE, RB, CH-M)
@@ -4360,6 +4864,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-google-e10s: None
             * browsertime-tp6m-live-geckoview-google-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-google-e10s: None
+            * browsertime-tp6m-essential-geckoview-google-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-google-e10s: None
+            * browsertime-tp6m-live-fenix-google-e10s: None
+            * browsertime-tp6m-live-geckoview-google-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-google-e10s: None
             * browsertime-tp6m-essential-fenix-google-e10s: None
             * browsertime-tp6m-essential-geckoview-google-e10s: mozilla-beta, trunk
@@ -4367,6 +4877,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-google-e10s: None
             * browsertime-tp6m-live-fenix-google-e10s: None
             * browsertime-tp6m-live-geckoview-google-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-google-e10s: None
+            * browsertime-tp6m-essential-geckoview-google-e10s: None
+            * browsertime-tp6m-essential-refbrow-google-e10s: None
+            * browsertime-tp6m-live-fenix-google-e10s: None
+            * browsertime-tp6m-live-geckoview-google-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-google-e10s: None
             * browsertime-tp6m-essential-geckoview-google-e10s: None
@@ -4374,6 +4890,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-google-e10s: None
             * browsertime-tp6m-live-geckoview-google-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-google-e10s: None
+            * browsertime-tp6m-essential-geckoview-google-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-google-e10s: None
+            * browsertime-tp6m-live-fenix-google-e10s: None
+            * browsertime-tp6m-live-geckoview-google-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-google-e10s: None
             * browsertime-tp6m-essential-fenix-google-e10s: None
             * browsertime-tp6m-essential-geckoview-google-e10s: mozilla-beta, trunk
@@ -4381,13 +4903,13 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-google-e10s: None
             * browsertime-tp6m-live-fenix-google-e10s: None
             * browsertime-tp6m-live-geckoview-google-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64/opt
             * browsertime-tp6m-essential-fenix-google-e10s: None
             * browsertime-tp6m-essential-geckoview-google-e10s: None
             * browsertime-tp6m-essential-refbrow-google-e10s: None
             * browsertime-tp6m-live-fenix-google-e10s: None
             * browsertime-tp6m-live-geckoview-google-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-google-e10s: None
             * browsertime-tp6m-essential-fenix-google-e10s: None
             * browsertime-tp6m-essential-geckoview-google-e10s: None
@@ -4395,6 +4917,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-google-e10s: None
             * browsertime-tp6m-live-fenix-google-e10s: None
             * browsertime-tp6m-live-geckoview-google-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-google-e10s: None
+            * browsertime-tp6m-essential-geckoview-google-e10s: None
+            * browsertime-tp6m-essential-refbrow-google-e10s: None
+            * browsertime-tp6m-live-fenix-google-e10s: None
+            * browsertime-tp6m-live-geckoview-google-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-google-e10s: None
             * browsertime-tp6m-essential-geckoview-google-e10s: None
@@ -4402,6 +4930,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-google-e10s: None
             * browsertime-tp6m-live-geckoview-google-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-google-e10s: None
+            * browsertime-tp6m-essential-geckoview-google-e10s: None
+            * browsertime-tp6m-essential-refbrow-google-e10s: None
+            * browsertime-tp6m-live-fenix-google-e10s: None
+            * browsertime-tp6m-live-geckoview-google-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-google-e10s: None
             * browsertime-tp6m-essential-fenix-google-e10s: None
             * browsertime-tp6m-essential-geckoview-google-e10s: None
@@ -4409,6 +4943,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-google-e10s: None
             * browsertime-tp6m-live-fenix-google-e10s: None
             * browsertime-tp6m-live-geckoview-google-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-essential-fenix-google-e10s: None
+            * browsertime-tp6m-essential-geckoview-google-e10s: None
+            * browsertime-tp6m-essential-refbrow-google-e10s: None
+            * browsertime-tp6m-live-fenix-google-e10s: None
+            * browsertime-tp6m-live-geckoview-google-e10s: None
 
 
 .. dropdown:: google-maps (BT, GV, FE, RB, CH-M)
@@ -4438,13 +4978,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-google-maps-e10s: None
             * browsertime-tp6m-refbrow-google-maps-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-google-maps-e10s: None
             * browsertime-tp6m-fenix-google-maps-e10s: None
             * browsertime-tp6m-geckoview-google-maps-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-google-maps-e10s: None
+            * browsertime-tp6m-live-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-refbrow-google-maps-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-google-maps-e10s: None
+            * browsertime-tp6m-fenix-google-maps-e10s: None
+            * browsertime-tp6m-geckoview-google-maps-e10s: None
             * browsertime-tp6m-live-chrome-m-google-maps-e10s: None
             * browsertime-tp6m-live-fenix-google-maps-e10s: None
             * browsertime-tp6m-live-geckoview-google-maps-e10s: None
             * browsertime-tp6m-refbrow-google-maps-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-google-maps-e10s: None
+            * browsertime-tp6m-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-live-fenix-google-maps-e10s: None
+            * browsertime-tp6m-live-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-refbrow-google-maps-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-google-maps-e10s: None
             * browsertime-tp6m-geckoview-google-maps-e10s: None
@@ -4452,20 +5004,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-google-maps-e10s: None
             * browsertime-tp6m-refbrow-google-maps-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-google-maps-e10s: None
             * browsertime-tp6m-fenix-google-maps-e10s: None
             * browsertime-tp6m-geckoview-google-maps-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-google-maps-e10s: None
             * browsertime-tp6m-live-fenix-google-maps-e10s: None
             * browsertime-tp6m-live-geckoview-google-maps-e10s: None
             * browsertime-tp6m-refbrow-google-maps-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-google-maps-e10s: None
-            * browsertime-tp6m-geckoview-google-maps-e10s: None
-            * browsertime-tp6m-live-fenix-google-maps-e10s: None
-            * browsertime-tp6m-live-geckoview-google-maps-e10s: None
-            * browsertime-tp6m-refbrow-google-maps-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-google-maps-e10s: None
             * browsertime-tp6m-fenix-google-maps-e10s: None
             * browsertime-tp6m-geckoview-google-maps-e10s: None
@@ -4473,6 +5017,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-google-maps-e10s: None
             * browsertime-tp6m-live-geckoview-google-maps-e10s: None
             * browsertime-tp6m-refbrow-google-maps-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-google-maps-e10s: None
+            * browsertime-tp6m-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-live-fenix-google-maps-e10s: None
+            * browsertime-tp6m-live-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-refbrow-google-maps-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-google-maps-e10s: None
+            * browsertime-tp6m-fenix-google-maps-e10s: None
+            * browsertime-tp6m-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-live-chrome-m-google-maps-e10s: None
+            * browsertime-tp6m-live-fenix-google-maps-e10s: None
+            * browsertime-tp6m-live-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-refbrow-google-maps-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-google-maps-e10s: None
+            * browsertime-tp6m-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-live-fenix-google-maps-e10s: None
+            * browsertime-tp6m-live-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-refbrow-google-maps-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-google-maps-e10s: None
             * browsertime-tp6m-geckoview-google-maps-e10s: None
@@ -4480,6 +5044,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-google-maps-e10s: None
             * browsertime-tp6m-refbrow-google-maps-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-google-maps-e10s: None
+            * browsertime-tp6m-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-live-fenix-google-maps-e10s: None
+            * browsertime-tp6m-live-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-refbrow-google-maps-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-google-maps-e10s: None
             * browsertime-tp6m-fenix-google-maps-e10s: None
             * browsertime-tp6m-geckoview-google-maps-e10s: None
@@ -4487,6 +5057,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-google-maps-e10s: None
             * browsertime-tp6m-live-geckoview-google-maps-e10s: None
             * browsertime-tp6m-refbrow-google-maps-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-google-maps-e10s: None
+            * browsertime-tp6m-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-live-fenix-google-maps-e10s: None
+            * browsertime-tp6m-live-geckoview-google-maps-e10s: None
+            * browsertime-tp6m-refbrow-google-maps-e10s: None
 
 
 .. dropdown:: google-search-restaurants (BT, GV, FE, RB, CH-M)
@@ -4517,13 +5093,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-google-search-restaurants-e10s: None
             * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-google-search-restaurants-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-google-search-restaurants-e10s: None
+            * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
             * browsertime-tp6m-live-chrome-m-google-search-restaurants-e10s: None
             * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
             * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
@@ -4531,20 +5119,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-google-search-restaurants-e10s: None
             * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-google-search-restaurants-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-google-search-restaurants-e10s: None
             * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
             * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
-            * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
-            * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
-            * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
-            * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-google-search-restaurants-e10s: None
             * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
@@ -4552,6 +5132,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
             * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-google-search-restaurants-e10s: None
+            * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-chrome-m-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
@@ -4559,6 +5159,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-google-search-restaurants-e10s: None
             * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
             * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
@@ -4566,6 +5172,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
             * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
             * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-fenix-google-search-restaurants-e10s: None
+            * browsertime-tp6m-live-geckoview-google-search-restaurants-e10s: None
+            * browsertime-tp6m-refbrow-google-search-restaurants-e10s: None
 
 
 .. dropdown:: imdb (BT, GV, FE, RB, CH-M)
@@ -4595,13 +5207,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-imdb-e10s: None
             * browsertime-tp6m-refbrow-imdb-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-imdb-e10s: None
             * browsertime-tp6m-fenix-imdb-e10s: None
             * browsertime-tp6m-geckoview-imdb-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-imdb-e10s: None
+            * browsertime-tp6m-live-geckoview-imdb-e10s: None
+            * browsertime-tp6m-refbrow-imdb-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-imdb-e10s: None
+            * browsertime-tp6m-fenix-imdb-e10s: None
+            * browsertime-tp6m-geckoview-imdb-e10s: None
             * browsertime-tp6m-live-chrome-m-imdb-e10s: None
             * browsertime-tp6m-live-fenix-imdb-e10s: None
             * browsertime-tp6m-live-geckoview-imdb-e10s: None
             * browsertime-tp6m-refbrow-imdb-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-imdb-e10s: None
+            * browsertime-tp6m-geckoview-imdb-e10s: None
+            * browsertime-tp6m-live-fenix-imdb-e10s: None
+            * browsertime-tp6m-live-geckoview-imdb-e10s: None
+            * browsertime-tp6m-refbrow-imdb-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-imdb-e10s: None
             * browsertime-tp6m-geckoview-imdb-e10s: None
@@ -4609,20 +5233,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-imdb-e10s: None
             * browsertime-tp6m-refbrow-imdb-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-imdb-e10s: None
             * browsertime-tp6m-fenix-imdb-e10s: None
             * browsertime-tp6m-geckoview-imdb-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-imdb-e10s: None
             * browsertime-tp6m-live-fenix-imdb-e10s: None
             * browsertime-tp6m-live-geckoview-imdb-e10s: None
             * browsertime-tp6m-refbrow-imdb-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-imdb-e10s: None
-            * browsertime-tp6m-geckoview-imdb-e10s: None
-            * browsertime-tp6m-live-fenix-imdb-e10s: None
-            * browsertime-tp6m-live-geckoview-imdb-e10s: None
-            * browsertime-tp6m-refbrow-imdb-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-imdb-e10s: None
             * browsertime-tp6m-fenix-imdb-e10s: None
             * browsertime-tp6m-geckoview-imdb-e10s: None
@@ -4630,6 +5246,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-imdb-e10s: None
             * browsertime-tp6m-live-geckoview-imdb-e10s: None
             * browsertime-tp6m-refbrow-imdb-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-imdb-e10s: None
+            * browsertime-tp6m-geckoview-imdb-e10s: None
+            * browsertime-tp6m-live-fenix-imdb-e10s: None
+            * browsertime-tp6m-live-geckoview-imdb-e10s: None
+            * browsertime-tp6m-refbrow-imdb-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-imdb-e10s: None
+            * browsertime-tp6m-fenix-imdb-e10s: None
+            * browsertime-tp6m-geckoview-imdb-e10s: None
+            * browsertime-tp6m-live-chrome-m-imdb-e10s: None
+            * browsertime-tp6m-live-fenix-imdb-e10s: None
+            * browsertime-tp6m-live-geckoview-imdb-e10s: None
+            * browsertime-tp6m-refbrow-imdb-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-imdb-e10s: None
+            * browsertime-tp6m-geckoview-imdb-e10s: None
+            * browsertime-tp6m-live-fenix-imdb-e10s: None
+            * browsertime-tp6m-live-geckoview-imdb-e10s: None
+            * browsertime-tp6m-refbrow-imdb-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-imdb-e10s: None
             * browsertime-tp6m-geckoview-imdb-e10s: None
@@ -4637,6 +5273,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-imdb-e10s: None
             * browsertime-tp6m-refbrow-imdb-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-imdb-e10s: None
+            * browsertime-tp6m-geckoview-imdb-e10s: None
+            * browsertime-tp6m-live-fenix-imdb-e10s: None
+            * browsertime-tp6m-live-geckoview-imdb-e10s: None
+            * browsertime-tp6m-refbrow-imdb-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-imdb-e10s: None
             * browsertime-tp6m-fenix-imdb-e10s: None
             * browsertime-tp6m-geckoview-imdb-e10s: None
@@ -4644,6 +5286,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-imdb-e10s: None
             * browsertime-tp6m-live-geckoview-imdb-e10s: None
             * browsertime-tp6m-refbrow-imdb-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-imdb-e10s: None
+            * browsertime-tp6m-geckoview-imdb-e10s: None
+            * browsertime-tp6m-live-fenix-imdb-e10s: None
+            * browsertime-tp6m-live-geckoview-imdb-e10s: None
+            * browsertime-tp6m-refbrow-imdb-e10s: None
 
 
 .. dropdown:: instagram (BT, GV, FE, RB, CH-M)
@@ -4674,13 +5322,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-instagram-e10s: None
             * browsertime-tp6m-refbrow-instagram-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-instagram-e10s: None
             * browsertime-tp6m-fenix-instagram-e10s: None
             * browsertime-tp6m-geckoview-instagram-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-instagram-e10s: None
+            * browsertime-tp6m-live-geckoview-instagram-e10s: None
+            * browsertime-tp6m-refbrow-instagram-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-instagram-e10s: None
+            * browsertime-tp6m-fenix-instagram-e10s: None
+            * browsertime-tp6m-geckoview-instagram-e10s: None
             * browsertime-tp6m-live-chrome-m-instagram-e10s: None
             * browsertime-tp6m-live-fenix-instagram-e10s: None
             * browsertime-tp6m-live-geckoview-instagram-e10s: None
             * browsertime-tp6m-refbrow-instagram-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-instagram-e10s: None
+            * browsertime-tp6m-geckoview-instagram-e10s: None
+            * browsertime-tp6m-live-fenix-instagram-e10s: None
+            * browsertime-tp6m-live-geckoview-instagram-e10s: None
+            * browsertime-tp6m-refbrow-instagram-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-instagram-e10s: None
             * browsertime-tp6m-geckoview-instagram-e10s: None
@@ -4688,20 +5348,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-instagram-e10s: None
             * browsertime-tp6m-refbrow-instagram-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-instagram-e10s: None
             * browsertime-tp6m-fenix-instagram-e10s: None
             * browsertime-tp6m-geckoview-instagram-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-instagram-e10s: None
             * browsertime-tp6m-live-fenix-instagram-e10s: None
             * browsertime-tp6m-live-geckoview-instagram-e10s: None
             * browsertime-tp6m-refbrow-instagram-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-instagram-e10s: None
-            * browsertime-tp6m-geckoview-instagram-e10s: None
-            * browsertime-tp6m-live-fenix-instagram-e10s: None
-            * browsertime-tp6m-live-geckoview-instagram-e10s: None
-            * browsertime-tp6m-refbrow-instagram-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-instagram-e10s: None
             * browsertime-tp6m-fenix-instagram-e10s: None
             * browsertime-tp6m-geckoview-instagram-e10s: None
@@ -4709,6 +5361,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-instagram-e10s: None
             * browsertime-tp6m-live-geckoview-instagram-e10s: None
             * browsertime-tp6m-refbrow-instagram-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-instagram-e10s: None
+            * browsertime-tp6m-geckoview-instagram-e10s: None
+            * browsertime-tp6m-live-fenix-instagram-e10s: None
+            * browsertime-tp6m-live-geckoview-instagram-e10s: None
+            * browsertime-tp6m-refbrow-instagram-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-instagram-e10s: None
+            * browsertime-tp6m-fenix-instagram-e10s: None
+            * browsertime-tp6m-geckoview-instagram-e10s: None
+            * browsertime-tp6m-live-chrome-m-instagram-e10s: None
+            * browsertime-tp6m-live-fenix-instagram-e10s: None
+            * browsertime-tp6m-live-geckoview-instagram-e10s: None
+            * browsertime-tp6m-refbrow-instagram-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-instagram-e10s: None
+            * browsertime-tp6m-geckoview-instagram-e10s: None
+            * browsertime-tp6m-live-fenix-instagram-e10s: None
+            * browsertime-tp6m-live-geckoview-instagram-e10s: None
+            * browsertime-tp6m-refbrow-instagram-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-instagram-e10s: None
             * browsertime-tp6m-geckoview-instagram-e10s: None
@@ -4716,6 +5388,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-instagram-e10s: None
             * browsertime-tp6m-refbrow-instagram-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-instagram-e10s: None
+            * browsertime-tp6m-geckoview-instagram-e10s: None
+            * browsertime-tp6m-live-fenix-instagram-e10s: None
+            * browsertime-tp6m-live-geckoview-instagram-e10s: None
+            * browsertime-tp6m-refbrow-instagram-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-instagram-e10s: None
             * browsertime-tp6m-fenix-instagram-e10s: None
             * browsertime-tp6m-geckoview-instagram-e10s: None
@@ -4723,6 +5401,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-instagram-e10s: None
             * browsertime-tp6m-live-geckoview-instagram-e10s: None
             * browsertime-tp6m-refbrow-instagram-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-instagram-e10s: None
+            * browsertime-tp6m-geckoview-instagram-e10s: None
+            * browsertime-tp6m-live-fenix-instagram-e10s: None
+            * browsertime-tp6m-live-geckoview-instagram-e10s: None
+            * browsertime-tp6m-refbrow-instagram-e10s: None
 
 
 .. dropdown:: microsoft-support (BT, GV, FE, RB, CH-M)
@@ -4752,6 +5436,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-microsoft-support-e10s: None
+            * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-microsoft-support-e10s: None
             * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: mozilla-beta, trunk
@@ -4759,6 +5449,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-microsoft-support-e10s: None
             * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: None
+            * browsertime-tp6m-essential-refbrow-microsoft-support-e10s: None
+            * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: None
@@ -4766,6 +5462,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-microsoft-support-e10s: None
+            * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-microsoft-support-e10s: None
             * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: mozilla-beta, trunk
@@ -4773,13 +5475,13 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-microsoft-support-e10s: None
             * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64/opt
             * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: None
             * browsertime-tp6m-essential-refbrow-microsoft-support-e10s: None
             * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-microsoft-support-e10s: None
             * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: None
@@ -4787,6 +5489,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-microsoft-support-e10s: None
             * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: None
+            * browsertime-tp6m-essential-refbrow-microsoft-support-e10s: None
+            * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: None
@@ -4794,6 +5502,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: None
+            * browsertime-tp6m-essential-refbrow-microsoft-support-e10s: None
+            * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-microsoft-support-e10s: None
             * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: None
@@ -4801,6 +5515,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-microsoft-support-e10s: None
             * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
             * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-essential-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-essential-geckoview-microsoft-support-e10s: None
+            * browsertime-tp6m-essential-refbrow-microsoft-support-e10s: None
+            * browsertime-tp6m-live-fenix-microsoft-support-e10s: None
+            * browsertime-tp6m-live-geckoview-microsoft-support-e10s: None
 
 
 .. dropdown:: reddit (BT, GV, FE, RB, CH-M)
@@ -4830,13 +5550,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-reddit-e10s: None
             * browsertime-tp6m-refbrow-reddit-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-reddit-e10s: None
             * browsertime-tp6m-fenix-reddit-e10s: None
             * browsertime-tp6m-geckoview-reddit-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-reddit-e10s: None
+            * browsertime-tp6m-live-geckoview-reddit-e10s: None
+            * browsertime-tp6m-refbrow-reddit-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-reddit-e10s: None
+            * browsertime-tp6m-fenix-reddit-e10s: None
+            * browsertime-tp6m-geckoview-reddit-e10s: None
             * browsertime-tp6m-live-chrome-m-reddit-e10s: None
             * browsertime-tp6m-live-fenix-reddit-e10s: None
             * browsertime-tp6m-live-geckoview-reddit-e10s: None
             * browsertime-tp6m-refbrow-reddit-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-reddit-e10s: None
+            * browsertime-tp6m-geckoview-reddit-e10s: None
+            * browsertime-tp6m-live-fenix-reddit-e10s: None
+            * browsertime-tp6m-live-geckoview-reddit-e10s: None
+            * browsertime-tp6m-refbrow-reddit-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-reddit-e10s: None
             * browsertime-tp6m-geckoview-reddit-e10s: None
@@ -4844,20 +5576,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-reddit-e10s: None
             * browsertime-tp6m-refbrow-reddit-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-reddit-e10s: None
             * browsertime-tp6m-fenix-reddit-e10s: None
             * browsertime-tp6m-geckoview-reddit-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-reddit-e10s: None
             * browsertime-tp6m-live-fenix-reddit-e10s: None
             * browsertime-tp6m-live-geckoview-reddit-e10s: None
             * browsertime-tp6m-refbrow-reddit-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-reddit-e10s: None
-            * browsertime-tp6m-geckoview-reddit-e10s: None
-            * browsertime-tp6m-live-fenix-reddit-e10s: None
-            * browsertime-tp6m-live-geckoview-reddit-e10s: None
-            * browsertime-tp6m-refbrow-reddit-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-reddit-e10s: None
             * browsertime-tp6m-fenix-reddit-e10s: None
             * browsertime-tp6m-geckoview-reddit-e10s: None
@@ -4865,6 +5589,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-reddit-e10s: None
             * browsertime-tp6m-live-geckoview-reddit-e10s: None
             * browsertime-tp6m-refbrow-reddit-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-reddit-e10s: None
+            * browsertime-tp6m-geckoview-reddit-e10s: None
+            * browsertime-tp6m-live-fenix-reddit-e10s: None
+            * browsertime-tp6m-live-geckoview-reddit-e10s: None
+            * browsertime-tp6m-refbrow-reddit-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-reddit-e10s: None
+            * browsertime-tp6m-fenix-reddit-e10s: None
+            * browsertime-tp6m-geckoview-reddit-e10s: None
+            * browsertime-tp6m-live-chrome-m-reddit-e10s: None
+            * browsertime-tp6m-live-fenix-reddit-e10s: None
+            * browsertime-tp6m-live-geckoview-reddit-e10s: None
+            * browsertime-tp6m-refbrow-reddit-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-reddit-e10s: None
+            * browsertime-tp6m-geckoview-reddit-e10s: None
+            * browsertime-tp6m-live-fenix-reddit-e10s: None
+            * browsertime-tp6m-live-geckoview-reddit-e10s: None
+            * browsertime-tp6m-refbrow-reddit-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-reddit-e10s: None
             * browsertime-tp6m-geckoview-reddit-e10s: None
@@ -4872,6 +5616,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-reddit-e10s: None
             * browsertime-tp6m-refbrow-reddit-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-reddit-e10s: None
+            * browsertime-tp6m-geckoview-reddit-e10s: None
+            * browsertime-tp6m-live-fenix-reddit-e10s: None
+            * browsertime-tp6m-live-geckoview-reddit-e10s: None
+            * browsertime-tp6m-refbrow-reddit-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-reddit-e10s: None
             * browsertime-tp6m-fenix-reddit-e10s: None
             * browsertime-tp6m-geckoview-reddit-e10s: None
@@ -4879,6 +5629,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-reddit-e10s: None
             * browsertime-tp6m-live-geckoview-reddit-e10s: None
             * browsertime-tp6m-refbrow-reddit-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-reddit-e10s: None
+            * browsertime-tp6m-geckoview-reddit-e10s: None
+            * browsertime-tp6m-live-fenix-reddit-e10s: None
+            * browsertime-tp6m-live-geckoview-reddit-e10s: None
+            * browsertime-tp6m-refbrow-reddit-e10s: None
 
 
 .. dropdown:: sina (BT, GV, FE, RB, CH-M)
@@ -4906,37 +5662,61 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-geckoview-sina-e10s: None
             * browsertime-tp6m-refbrow-sina-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-sina-e10s: None
             * browsertime-tp6m-fenix-sina-e10s: None
             * browsertime-tp6m-geckoview-sina-e10s: mozilla-beta, trunk
             * browsertime-tp6m-refbrow-sina-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-sina-e10s: None
+            * browsertime-tp6m-fenix-sina-e10s: None
+            * browsertime-tp6m-geckoview-sina-e10s: None
+            * browsertime-tp6m-refbrow-sina-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-sina-e10s: None
+            * browsertime-tp6m-geckoview-sina-e10s: None
+            * browsertime-tp6m-refbrow-sina-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-sina-e10s: None
             * browsertime-tp6m-geckoview-sina-e10s: None
             * browsertime-tp6m-refbrow-sina-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-sina-e10s: None
             * browsertime-tp6m-fenix-sina-e10s: None
             * browsertime-tp6m-geckoview-sina-e10s: mozilla-beta, trunk
             * browsertime-tp6m-refbrow-sina-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
+            * browsertime-tp6m-chrome-m-sina-e10s: None
             * browsertime-tp6m-fenix-sina-e10s: None
             * browsertime-tp6m-geckoview-sina-e10s: None
             * browsertime-tp6m-refbrow-sina-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-sina-e10s: None
+            * browsertime-tp6m-geckoview-sina-e10s: None
+            * browsertime-tp6m-refbrow-sina-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
             * browsertime-tp6m-chrome-m-sina-e10s: None
             * browsertime-tp6m-fenix-sina-e10s: None
             * browsertime-tp6m-geckoview-sina-e10s: None
             * browsertime-tp6m-refbrow-sina-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-sina-e10s: None
+            * browsertime-tp6m-geckoview-sina-e10s: None
+            * browsertime-tp6m-refbrow-sina-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-sina-e10s: None
             * browsertime-tp6m-geckoview-sina-e10s: None
             * browsertime-tp6m-refbrow-sina-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-sina-e10s: None
+            * browsertime-tp6m-geckoview-sina-e10s: None
+            * browsertime-tp6m-refbrow-sina-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-sina-e10s: None
             * browsertime-tp6m-fenix-sina-e10s: None
             * browsertime-tp6m-geckoview-sina-e10s: None
             * browsertime-tp6m-refbrow-sina-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-sina-e10s: None
+            * browsertime-tp6m-geckoview-sina-e10s: None
+            * browsertime-tp6m-refbrow-sina-e10s: None
 
 
 .. dropdown:: stackoverflow (BT, GV, FE, RB, CH-M)
@@ -4966,13 +5746,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
             * browsertime-tp6m-refbrow-stackoverflow-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-stackoverflow-e10s: None
             * browsertime-tp6m-fenix-stackoverflow-e10s: None
             * browsertime-tp6m-geckoview-stackoverflow-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-refbrow-stackoverflow-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-stackoverflow-e10s: None
+            * browsertime-tp6m-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-geckoview-stackoverflow-e10s: None
             * browsertime-tp6m-live-chrome-m-stackoverflow-e10s: None
             * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
             * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
             * browsertime-tp6m-refbrow-stackoverflow-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-refbrow-stackoverflow-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-stackoverflow-e10s: None
             * browsertime-tp6m-geckoview-stackoverflow-e10s: None
@@ -4980,20 +5772,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
             * browsertime-tp6m-refbrow-stackoverflow-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-stackoverflow-e10s: None
             * browsertime-tp6m-fenix-stackoverflow-e10s: None
             * browsertime-tp6m-geckoview-stackoverflow-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-stackoverflow-e10s: None
             * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
             * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
             * browsertime-tp6m-refbrow-stackoverflow-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-stackoverflow-e10s: None
-            * browsertime-tp6m-geckoview-stackoverflow-e10s: None
-            * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
-            * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
-            * browsertime-tp6m-refbrow-stackoverflow-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-stackoverflow-e10s: None
             * browsertime-tp6m-fenix-stackoverflow-e10s: None
             * browsertime-tp6m-geckoview-stackoverflow-e10s: None
@@ -5001,6 +5785,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
             * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
             * browsertime-tp6m-refbrow-stackoverflow-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-refbrow-stackoverflow-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-stackoverflow-e10s: None
+            * browsertime-tp6m-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-live-chrome-m-stackoverflow-e10s: None
+            * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-refbrow-stackoverflow-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-refbrow-stackoverflow-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-stackoverflow-e10s: None
             * browsertime-tp6m-geckoview-stackoverflow-e10s: None
@@ -5008,6 +5812,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
             * browsertime-tp6m-refbrow-stackoverflow-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-refbrow-stackoverflow-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-stackoverflow-e10s: None
             * browsertime-tp6m-fenix-stackoverflow-e10s: None
             * browsertime-tp6m-geckoview-stackoverflow-e10s: None
@@ -5015,6 +5825,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
             * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
             * browsertime-tp6m-refbrow-stackoverflow-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-live-fenix-stackoverflow-e10s: None
+            * browsertime-tp6m-live-geckoview-stackoverflow-e10s: None
+            * browsertime-tp6m-refbrow-stackoverflow-e10s: None
 
 
 .. dropdown:: web-de (BT, GV, FE, RB, CH-M)
@@ -5044,13 +5860,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-web-de-e10s: None
             * browsertime-tp6m-refbrow-web-de-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-web-de-e10s: None
             * browsertime-tp6m-fenix-web-de-e10s: None
             * browsertime-tp6m-geckoview-web-de-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-web-de-e10s: None
+            * browsertime-tp6m-live-geckoview-web-de-e10s: None
+            * browsertime-tp6m-refbrow-web-de-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-web-de-e10s: None
+            * browsertime-tp6m-fenix-web-de-e10s: None
+            * browsertime-tp6m-geckoview-web-de-e10s: None
             * browsertime-tp6m-live-chrome-m-web-de-e10s: None
             * browsertime-tp6m-live-fenix-web-de-e10s: None
             * browsertime-tp6m-live-geckoview-web-de-e10s: None
             * browsertime-tp6m-refbrow-web-de-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-web-de-e10s: None
+            * browsertime-tp6m-geckoview-web-de-e10s: None
+            * browsertime-tp6m-live-fenix-web-de-e10s: None
+            * browsertime-tp6m-live-geckoview-web-de-e10s: None
+            * browsertime-tp6m-refbrow-web-de-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-web-de-e10s: None
             * browsertime-tp6m-geckoview-web-de-e10s: None
@@ -5058,20 +5886,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-web-de-e10s: None
             * browsertime-tp6m-refbrow-web-de-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-web-de-e10s: None
             * browsertime-tp6m-fenix-web-de-e10s: None
             * browsertime-tp6m-geckoview-web-de-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-web-de-e10s: None
             * browsertime-tp6m-live-fenix-web-de-e10s: None
             * browsertime-tp6m-live-geckoview-web-de-e10s: None
             * browsertime-tp6m-refbrow-web-de-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-web-de-e10s: None
-            * browsertime-tp6m-geckoview-web-de-e10s: None
-            * browsertime-tp6m-live-fenix-web-de-e10s: None
-            * browsertime-tp6m-live-geckoview-web-de-e10s: None
-            * browsertime-tp6m-refbrow-web-de-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-web-de-e10s: None
             * browsertime-tp6m-fenix-web-de-e10s: None
             * browsertime-tp6m-geckoview-web-de-e10s: None
@@ -5079,6 +5899,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-web-de-e10s: None
             * browsertime-tp6m-live-geckoview-web-de-e10s: None
             * browsertime-tp6m-refbrow-web-de-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-web-de-e10s: None
+            * browsertime-tp6m-geckoview-web-de-e10s: None
+            * browsertime-tp6m-live-fenix-web-de-e10s: None
+            * browsertime-tp6m-live-geckoview-web-de-e10s: None
+            * browsertime-tp6m-refbrow-web-de-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-web-de-e10s: None
+            * browsertime-tp6m-fenix-web-de-e10s: None
+            * browsertime-tp6m-geckoview-web-de-e10s: None
+            * browsertime-tp6m-live-chrome-m-web-de-e10s: None
+            * browsertime-tp6m-live-fenix-web-de-e10s: None
+            * browsertime-tp6m-live-geckoview-web-de-e10s: None
+            * browsertime-tp6m-refbrow-web-de-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-web-de-e10s: None
+            * browsertime-tp6m-geckoview-web-de-e10s: None
+            * browsertime-tp6m-live-fenix-web-de-e10s: None
+            * browsertime-tp6m-live-geckoview-web-de-e10s: None
+            * browsertime-tp6m-refbrow-web-de-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-web-de-e10s: None
             * browsertime-tp6m-geckoview-web-de-e10s: None
@@ -5086,6 +5926,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-web-de-e10s: None
             * browsertime-tp6m-refbrow-web-de-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-web-de-e10s: None
+            * browsertime-tp6m-geckoview-web-de-e10s: None
+            * browsertime-tp6m-live-fenix-web-de-e10s: None
+            * browsertime-tp6m-live-geckoview-web-de-e10s: None
+            * browsertime-tp6m-refbrow-web-de-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-web-de-e10s: None
             * browsertime-tp6m-fenix-web-de-e10s: None
             * browsertime-tp6m-geckoview-web-de-e10s: None
@@ -5093,6 +5939,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-web-de-e10s: None
             * browsertime-tp6m-live-geckoview-web-de-e10s: None
             * browsertime-tp6m-refbrow-web-de-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-web-de-e10s: None
+            * browsertime-tp6m-geckoview-web-de-e10s: None
+            * browsertime-tp6m-live-fenix-web-de-e10s: None
+            * browsertime-tp6m-live-geckoview-web-de-e10s: None
+            * browsertime-tp6m-refbrow-web-de-e10s: None
 
 
 .. dropdown:: wikipedia (BT, GV, FE, RB, CH-M)
@@ -5122,13 +5974,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
             * browsertime-tp6m-refbrow-wikipedia-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-wikipedia-e10s: None
             * browsertime-tp6m-fenix-wikipedia-e10s: None
             * browsertime-tp6m-geckoview-wikipedia-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-refbrow-wikipedia-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-wikipedia-e10s: None
+            * browsertime-tp6m-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-geckoview-wikipedia-e10s: None
             * browsertime-tp6m-live-chrome-m-wikipedia-e10s: None
             * browsertime-tp6m-live-fenix-wikipedia-e10s: None
             * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
             * browsertime-tp6m-refbrow-wikipedia-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-live-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-refbrow-wikipedia-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-wikipedia-e10s: None
             * browsertime-tp6m-geckoview-wikipedia-e10s: None
@@ -5136,20 +6000,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
             * browsertime-tp6m-refbrow-wikipedia-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-wikipedia-e10s: None
             * browsertime-tp6m-fenix-wikipedia-e10s: None
             * browsertime-tp6m-geckoview-wikipedia-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-wikipedia-e10s: None
             * browsertime-tp6m-live-fenix-wikipedia-e10s: None
             * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
             * browsertime-tp6m-refbrow-wikipedia-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
-            * browsertime-tp6m-fenix-wikipedia-e10s: None
-            * browsertime-tp6m-geckoview-wikipedia-e10s: None
-            * browsertime-tp6m-live-fenix-wikipedia-e10s: None
-            * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
-            * browsertime-tp6m-refbrow-wikipedia-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-wikipedia-e10s: None
             * browsertime-tp6m-fenix-wikipedia-e10s: None
             * browsertime-tp6m-geckoview-wikipedia-e10s: None
@@ -5157,6 +6013,26 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-wikipedia-e10s: None
             * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
             * browsertime-tp6m-refbrow-wikipedia-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-live-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-refbrow-wikipedia-e10s: None
+      * test-android-hw-p2-8-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-wikipedia-e10s: None
+            * browsertime-tp6m-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-live-chrome-m-wikipedia-e10s: None
+            * browsertime-tp6m-live-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-refbrow-wikipedia-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-live-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-refbrow-wikipedia-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-wikipedia-e10s: None
             * browsertime-tp6m-geckoview-wikipedia-e10s: None
@@ -5164,6 +6040,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
             * browsertime-tp6m-refbrow-wikipedia-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-live-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-refbrow-wikipedia-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-wikipedia-e10s: None
             * browsertime-tp6m-fenix-wikipedia-e10s: None
             * browsertime-tp6m-geckoview-wikipedia-e10s: None
@@ -5171,6 +6053,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-wikipedia-e10s: None
             * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
             * browsertime-tp6m-refbrow-wikipedia-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-live-fenix-wikipedia-e10s: None
+            * browsertime-tp6m-live-geckoview-wikipedia-e10s: None
+            * browsertime-tp6m-refbrow-wikipedia-e10s: None
 
 
 .. dropdown:: youtube (BT, GV, FE, RB, CH-M)
@@ -5200,13 +6088,25 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-youtube-e10s: None
             * browsertime-tp6m-refbrow-youtube-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-youtube-e10s: None
             * browsertime-tp6m-fenix-youtube-e10s: None
             * browsertime-tp6m-geckoview-youtube-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-live-fenix-youtube-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-e10s: None
+            * browsertime-tp6m-refbrow-youtube-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
+            * browsertime-tp6m-chrome-m-youtube-e10s: None
+            * browsertime-tp6m-fenix-youtube-e10s: None
+            * browsertime-tp6m-geckoview-youtube-e10s: None
             * browsertime-tp6m-live-chrome-m-youtube-e10s: None
             * browsertime-tp6m-live-fenix-youtube-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-e10s: None
             * browsertime-tp6m-refbrow-youtube-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-fenix-youtube-e10s: None
+            * browsertime-tp6m-geckoview-youtube-e10s: None
+            * browsertime-tp6m-live-fenix-youtube-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-e10s: None
+            * browsertime-tp6m-refbrow-youtube-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-youtube-e10s: None
             * browsertime-tp6m-geckoview-youtube-e10s: None
@@ -5214,21 +6114,27 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-youtube-e10s: None
             * browsertime-tp6m-refbrow-youtube-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
-            * browsertime-tp6m-chrome-m-youtube-e10s: None
             * browsertime-tp6m-fenix-youtube-e10s: None
             * browsertime-tp6m-geckoview-youtube-e10s: mozilla-beta, trunk
-            * browsertime-tp6m-live-chrome-m-youtube-e10s: None
             * browsertime-tp6m-live-fenix-youtube-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-e10s: None
             * browsertime-tp6m-profiling-geckoview-youtube-e10s: mozilla-central
             * browsertime-tp6m-refbrow-youtube-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
+            * browsertime-tp6m-chrome-m-youtube-e10s: None
+            * browsertime-tp6m-fenix-youtube-e10s: None
+            * browsertime-tp6m-geckoview-youtube-e10s: None
+            * browsertime-tp6m-live-chrome-m-youtube-e10s: None
+            * browsertime-tp6m-live-fenix-youtube-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-e10s: None
+            * browsertime-tp6m-refbrow-youtube-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64/opt
             * browsertime-tp6m-fenix-youtube-e10s: None
             * browsertime-tp6m-geckoview-youtube-e10s: None
             * browsertime-tp6m-live-fenix-youtube-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-e10s: None
             * browsertime-tp6m-refbrow-youtube-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-arm7-shippable/opt
             * browsertime-tp6m-chrome-m-youtube-e10s: None
             * browsertime-tp6m-fenix-youtube-e10s: None
             * browsertime-tp6m-geckoview-youtube-e10s: None
@@ -5236,6 +6142,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-youtube-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-e10s: None
             * browsertime-tp6m-refbrow-youtube-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-fenix-youtube-e10s: None
+            * browsertime-tp6m-geckoview-youtube-e10s: None
+            * browsertime-tp6m-live-fenix-youtube-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-e10s: None
+            * browsertime-tp6m-refbrow-youtube-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-fenix-youtube-e10s: None
             * browsertime-tp6m-geckoview-youtube-e10s: None
@@ -5243,6 +6155,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-geckoview-youtube-e10s: None
             * browsertime-tp6m-refbrow-youtube-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-fenix-youtube-e10s: None
+            * browsertime-tp6m-geckoview-youtube-e10s: None
+            * browsertime-tp6m-live-fenix-youtube-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-e10s: None
+            * browsertime-tp6m-refbrow-youtube-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-chrome-m-youtube-e10s: None
             * browsertime-tp6m-fenix-youtube-e10s: None
             * browsertime-tp6m-geckoview-youtube-e10s: None
@@ -5250,6 +6168,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-youtube-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-e10s: None
             * browsertime-tp6m-refbrow-youtube-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-fenix-youtube-e10s: None
+            * browsertime-tp6m-geckoview-youtube-e10s: None
+            * browsertime-tp6m-live-fenix-youtube-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-e10s: None
+            * browsertime-tp6m-refbrow-youtube-e10s: None
 
 
 .. dropdown:: youtube-watch (BT, GV, FE, RB, CH-M)
@@ -5279,6 +6203,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
       * test-android-hw-g5-7-0-arm7-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-youtube-watch-e10s: None
+            * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
+      * test-android-hw-g5-7-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-youtube-watch-e10s: None
             * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: mozilla-beta, trunk
@@ -5286,6 +6216,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-youtube-watch-e10s: None
             * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
+      * test-android-hw-g5-7-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: None
+            * browsertime-tp6m-essential-refbrow-youtube-watch-e10s: None
+            * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: None
@@ -5293,6 +6229,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
       * test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: mozilla-beta, trunk
+            * browsertime-tp6m-essential-refbrow-youtube-watch-e10s: None
+            * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
+      * test-android-hw-p2-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-youtube-watch-e10s: None
             * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: mozilla-beta, trunk
@@ -5300,13 +6242,13 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-youtube-watch-e10s: None
             * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
-      * test-android-hw-p2-8-0-arm7-qr/opt
+      * test-android-hw-p2-8-0-android-aarch64/opt
             * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: None
             * browsertime-tp6m-essential-refbrow-youtube-watch-e10s: None
             * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
-      * test-android-hw-p2-8-0-arm7-shippable-qr/opt
+      * test-android-hw-p2-8-0-arm7-shippable/opt
             * browsertime-tp6m-essential-chrome-m-youtube-watch-e10s: None
             * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: None
@@ -5314,6 +6256,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-youtube-watch-e10s: None
             * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
+      * test-android-hw-p2-8-0-arm7/opt
+            * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: None
+            * browsertime-tp6m-essential-refbrow-youtube-watch-e10s: None
+            * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-qr/opt
             * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: None
@@ -5321,6 +6269,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
       * test-android-hw-s7-8-0-android-aarch64-shippable-qr/opt
+            * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: None
+            * browsertime-tp6m-essential-refbrow-youtube-watch-e10s: None
+            * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64-shippable/opt
             * browsertime-tp6m-essential-chrome-m-youtube-watch-e10s: None
             * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: None
@@ -5328,6 +6282,12 @@ Page-load performance test suite on Android. The links direct to the actual webs
             * browsertime-tp6m-live-chrome-m-youtube-watch-e10s: None
             * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
             * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None
+      * test-android-hw-s7-8-0-android-aarch64/opt
+            * browsertime-tp6m-essential-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-essential-geckoview-youtube-watch-e10s: None
+            * browsertime-tp6m-essential-refbrow-youtube-watch-e10s: None
+            * browsertime-tp6m-live-fenix-youtube-watch-e10s: None
+            * browsertime-tp6m-live-geckoview-youtube-watch-e10s: None