[build] Cleanup CircleCI configuration

- Remove the legacy build jobs
- Remove the next- namespace.

1104 files changed, 0 insertions, 38640 deletions

diff --git a/metrics/next-android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json
deleted file mode 100644
index 7da0796966..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            5,
-            5,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-color/default/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-color/function/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-color/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-color/literal/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-opacity/color/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-opacity/color/metrics.json
deleted file mode 100644
index d1d3c719b6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-opacity/color/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-opacity/image/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-opacity/image/metrics.json
deleted file mode 100644
index 7e01e8e930..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-opacity/image/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                1081408,
-                1081408
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-opacity/overlay/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-opacity/overlay/metrics.json
deleted file mode 100644
index 12f80d05a3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-opacity/overlay/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            437478
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            5,
-            1,
-            [
-                1605632,
-                1605632
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/@2x/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/@2x/metrics.json
deleted file mode 100644
index 89a3b9090c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/@2x/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            77034
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/literal/metrics.json
deleted file mode 100644
index b17c1d43cf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/missing/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/missing/metrics.json
deleted file mode 100644
index cdb304a90f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/missing/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/pitch/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/pitch/metrics.json
deleted file mode 100644
index 77a63a3f58..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/pitch/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            5,
-            1,
-            [
-                81920,
-                81920
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/rotated/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/rotated/metrics.json
deleted file mode 100644
index b17c1d43cf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/rotated/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json
deleted file mode 100644
index b17c1d43cf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-visibility/none/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-visibility/none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/background-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-visibility/visible/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/background-visibility/visible/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json
deleted file mode 100644
index d149583eac..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            233147
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            12,
-            7,
-            20,
-            1,
-            [
-                98304,
-                98304
-            ],
-            [
-                245560,
-                245560
-            ],
-            [
-                263140,
-                263140
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json
deleted file mode 100644
index d149583eac..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            233147
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            12,
-            7,
-            20,
-            1,
-            [
-                98304,
-                98304
-            ],
-            [
-                245560,
-                245560
-            ],
-            [
-                263140,
-                263140
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0/metrics.json b/metrics/next-android-render-test-runner/render-tests/basic-v9/z0/metrics.json
deleted file mode 100644
index f5baf3924a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            122665
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                81868,
-                81868
-            ],
-            [
-                87756,
-                87756
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/bright-v9/z0/metrics.json b/metrics/next-android-render-test-runner/render-tests/bright-v9/z0/metrics.json
deleted file mode 100644
index bc753ead90..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/bright-v9/z0/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            212512
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            10,
-            5,
-            14,
-            1,
-            [
-                25296,
-                25296
-            ],
-            [
-                149284,
-                149284
-            ],
-            [
-                192796,
-                192796
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/blending/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/blending/metrics.json
deleted file mode 100644
index 3e29447ea9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/blending/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                192,
-                192
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/function/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/property-function/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json
deleted file mode 100644
index 2b00a4fa06..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-color/default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-color/function/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-color/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-color/literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-color/property-function/metrics.json
deleted file mode 100644
index 2b00a4fa06..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-color/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json
deleted file mode 100644
index cd37b906a5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json
deleted file mode 100644
index b9307738e0..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json
deleted file mode 100644
index 742ac68192..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/point/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/point/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/point/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json
deleted file mode 100644
index b65ae23a75..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/blending/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/blending/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/blending/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/function/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json
deleted file mode 100644
index 2b00a4fa06..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
deleted file mode 100644
index 62ea5c7dea..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
deleted file mode 100644
index 62ea5c7dea..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
deleted file mode 100644
index 62ea5c7dea..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
deleted file mode 100644
index 62ea5c7dea..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json
deleted file mode 100644
index 62ea5c7dea..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json
deleted file mode 100644
index 62ea5c7dea..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json
deleted file mode 100644
index 62ea5c7dea..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/function/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/property-function/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json
deleted file mode 100644
index 2b00a4fa06..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json
deleted file mode 100644
index 2b00a4fa06..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
deleted file mode 100644
index cd37b906a5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
deleted file mode 100644
index 2b00a4fa06..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
deleted file mode 100644
index 2b00a4fa06..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-translate/default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-translate/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-translate/function/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-translate/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-translate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-translate/literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/circle-translate/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json
deleted file mode 100644
index ca19895c81..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json
deleted file mode 100644
index ca19895c81..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json
deleted file mode 100644
index b65ae23a75..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
deleted file mode 100644
index 869c4378bf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                316,
-                316
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
deleted file mode 100644
index 5cc4b977ff..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
deleted file mode 100644
index fe9af55d56..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            6,
-            5,
-            1,
-            [
-                1073184,
-                1073184
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json
deleted file mode 100644
index 43b92c8fd6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json
deleted file mode 100644
index aeff97a9b2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            5,
-            1,
-            [
-                540672,
-                540672
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json
deleted file mode 100644
index ca19895c81..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json
deleted file mode 100644
index ca19895c81..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json
deleted file mode 100644
index b65ae23a75..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
deleted file mode 100644
index 869c4378bf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                316,
-                316
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
deleted file mode 100644
index 5cc4b977ff..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
deleted file mode 100644
index fe9af55d56..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            6,
-            5,
-            1,
-            [
-                1073184,
-                1073184
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json
deleted file mode 100644
index 43b92c8fd6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json
deleted file mode 100644
index aeff97a9b2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            5,
-            1,
-            [
-                540672,
-                540672
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json
deleted file mode 100644
index d5ad1d9303..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json
deleted file mode 100644
index d5ad1d9303..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
deleted file mode 100644
index d5ad1d9303..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
deleted file mode 100644
index d0a09330c3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                396,
-                396
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
deleted file mode 100644
index 54232a8859..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
deleted file mode 100644
index 54232a8859..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
deleted file mode 100644
index b342e18183..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            5,
-            9,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
deleted file mode 100644
index 2ecd93ab0d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            7,
-            1,
-            [
-                1089568,
-                1089568
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json
deleted file mode 100644
index 34e1641244..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
deleted file mode 100644
index 8543c93e3f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            5,
-            7,
-            1,
-            [
-                557056,
-                557056
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
deleted file mode 100644
index 7f04882574..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                304,
-                304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
deleted file mode 100644
index 158f4a877c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                336,
-                336
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
deleted file mode 100644
index 158f4a877c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                336,
-                336
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
deleted file mode 100644
index 070982798d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                316,
-                316
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
deleted file mode 100644
index 070982798d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                316,
-                316
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
deleted file mode 100644
index d0a09330c3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                396,
-                396
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
deleted file mode 100644
index 070982798d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                316,
-                316
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
deleted file mode 100644
index 9dd47aeeeb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                336,
-                336
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
deleted file mode 100644
index f460f1be9e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                336,
-                336
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
deleted file mode 100644
index a4c2b929c7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            5,
-            9,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                396,
-                396
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
deleted file mode 100644
index f9f2c55c05..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            7,
-            1,
-            [
-                1089568,
-                1089568
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                316,
-                316
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
deleted file mode 100644
index b9a70d7457..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                396,
-                396
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
deleted file mode 100644
index ba3da4f660..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            5,
-            7,
-            1,
-            [
-                557056,
-                557056
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                316,
-                316
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
deleted file mode 100644
index e06f8fc8fc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                476,
-                476
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json
deleted file mode 100644
index d9701f6181..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json
deleted file mode 100644
index d9701f6181..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
deleted file mode 100644
index 54232a8859..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
deleted file mode 100644
index 158f4a877c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                336,
-                336
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
deleted file mode 100644
index 511b43f4d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
deleted file mode 100644
index 511b43f4d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
deleted file mode 100644
index 5565a4dd48..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            10,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
deleted file mode 100644
index 130eb52850..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            7,
-            8,
-            1,
-            [
-                1089568,
-                1089568
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json
deleted file mode 100644
index aac3c6d308..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                102,
-                102
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
deleted file mode 100644
index a6e96270b2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            5,
-            8,
-            1,
-            [
-                557056,
-                557056
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
deleted file mode 100644
index c1bede4b52..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            4,
-            12,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                66,
-                66
-            ],
-            [
-                244,
-                244
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json
deleted file mode 100644
index d9701f6181..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json
deleted file mode 100644
index d9701f6181..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
deleted file mode 100644
index 54232a8859..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
deleted file mode 100644
index 158f4a877c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                336,
-                336
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
deleted file mode 100644
index 511b43f4d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
deleted file mode 100644
index 511b43f4d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
deleted file mode 100644
index 5565a4dd48..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            10,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
deleted file mode 100644
index 130eb52850..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            7,
-            8,
-            1,
-            [
-                1089568,
-                1089568
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json
deleted file mode 100644
index aac3c6d308..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                102,
-                102
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
deleted file mode 100644
index a6e96270b2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            5,
-            8,
-            1,
-            [
-                557056,
-                557056
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
deleted file mode 100644
index c1bede4b52..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            4,
-            12,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                66,
-                66
-            ],
-            [
-                244,
-                244
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
deleted file mode 100644
index 046dcc83f8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            5,
-            7,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
deleted file mode 100644
index 046dcc83f8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            5,
-            7,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
deleted file mode 100644
index b342e18183..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            5,
-            9,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
deleted file mode 100644
index a4c2b929c7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            5,
-            9,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                396,
-                396
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
deleted file mode 100644
index 5565a4dd48..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            10,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
deleted file mode 100644
index 5565a4dd48..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            10,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                114,
-                114
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
deleted file mode 100644
index 94161dda76..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            7,
-            7,
-            3,
-            [
-                38912,
-                38912
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
deleted file mode 100644
index eb8235bd22..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            9,
-            7,
-            2,
-            [
-                1092640,
-                1092640
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
deleted file mode 100644
index e6b45ea3c9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            5,
-            9,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
deleted file mode 100644
index 46ae22eb39..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            7,
-            2,
-            [
-                560128,
-                560128
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
deleted file mode 100644
index 60f01ff9e3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            6,
-            11,
-            2,
-            [
-                25400,
-                25400
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                304,
-                304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
deleted file mode 100644
index 019fd54df3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            6,
-            5,
-            1,
-            [
-                1073184,
-                1073184
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
deleted file mode 100644
index 019fd54df3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            6,
-            5,
-            1,
-            [
-                1073184,
-                1073184
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
deleted file mode 100644
index 2ecd93ab0d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            7,
-            1,
-            [
-                1089568,
-                1089568
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
deleted file mode 100644
index f9f2c55c05..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            7,
-            1,
-            [
-                1089568,
-                1089568
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                316,
-                316
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
deleted file mode 100644
index 130eb52850..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            7,
-            8,
-            1,
-            [
-                1089568,
-                1089568
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
deleted file mode 100644
index 130eb52850..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            7,
-            8,
-            1,
-            [
-                1089568,
-                1089568
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
deleted file mode 100644
index eb8235bd22..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            9,
-            7,
-            2,
-            [
-                1092640,
-                1092640
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
deleted file mode 100644
index 6cdf449a0c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            5,
-            1,
-            [
-                1073184,
-                1073184
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
deleted file mode 100644
index 1d0c8f8153..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            7,
-            7,
-            1,
-            [
-                1089568,
-                1089568
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
deleted file mode 100644
index 40f09a9305..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            345621
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            8,
-            5,
-            1,
-            [
-                1597472,
-                1597472
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
deleted file mode 100644
index 1b23d9d85c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            495139
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            8,
-            9,
-            1,
-            [
-                1079128,
-                1079128
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json
deleted file mode 100644
index 2fb82f1086..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json
deleted file mode 100644
index 2fb82f1086..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json
deleted file mode 100644
index 34e1641244..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
deleted file mode 100644
index b9a70d7457..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                396,
-                396
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json
deleted file mode 100644
index aac3c6d308..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                102,
-                102
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json
deleted file mode 100644
index aac3c6d308..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                102,
-                102
-            ],
-            [
-                164,
-                164
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
deleted file mode 100644
index e6b45ea3c9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            5,
-            9,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
deleted file mode 100644
index 1d0c8f8153..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            283480
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            7,
-            7,
-            1,
-            [
-                1089568,
-                1089568
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json
deleted file mode 100644
index 2fb82f1086..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json
deleted file mode 100644
index dfb24aaa91..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            7,
-            1,
-            [
-                557056,
-                557056
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
deleted file mode 100644
index cafdf6fa10..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            11,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                304,
-                304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json
deleted file mode 100644
index 9297ddb669..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            5,
-            1,
-            [
-                540672,
-                540672
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json
deleted file mode 100644
index 9297ddb669..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            5,
-            1,
-            [
-                540672,
-                540672
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
deleted file mode 100644
index 8543c93e3f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            5,
-            7,
-            1,
-            [
-                557056,
-                557056
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
deleted file mode 100644
index ba3da4f660..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            5,
-            7,
-            1,
-            [
-                557056,
-                557056
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                316,
-                316
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
deleted file mode 100644
index a6e96270b2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            5,
-            8,
-            1,
-            [
-                557056,
-                557056
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
deleted file mode 100644
index a6e96270b2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            5,
-            8,
-            1,
-            [
-                557056,
-                557056
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
deleted file mode 100644
index 46ae22eb39..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            7,
-            2,
-            [
-                560128,
-                560128
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
deleted file mode 100644
index 40f09a9305..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            345621
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            8,
-            5,
-            1,
-            [
-                1597472,
-                1597472
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json
deleted file mode 100644
index dfb24aaa91..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            7,
-            1,
-            [
-                557056,
-                557056
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
deleted file mode 100644
index 11aca40c02..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            62141
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            4,
-            5,
-            1,
-            [
-                540672,
-                540672
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
deleted file mode 100644
index 1900b99249..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            273800
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            6,
-            9,
-            1,
-            [
-                546616,
-                546616
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
deleted file mode 100644
index 7f04882574..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                304,
-                304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
deleted file mode 100644
index e06f8fc8fc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                476,
-                476
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
deleted file mode 100644
index c1bede4b52..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            4,
-            12,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                66,
-                66
-            ],
-            [
-                244,
-                244
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
deleted file mode 100644
index c1bede4b52..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            4,
-            12,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                66,
-                66
-            ],
-            [
-                244,
-                244
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
deleted file mode 100644
index 60f01ff9e3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            6,
-            11,
-            2,
-            [
-                25400,
-                25400
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                304,
-                304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
deleted file mode 100644
index 1b23d9d85c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            495139
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            8,
-            9,
-            1,
-            [
-                1079128,
-                1079128
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
deleted file mode 100644
index cafdf6fa10..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            11,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                304,
-                304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
deleted file mode 100644
index 1900b99249..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            273800
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            6,
-            9,
-            1,
-            [
-                546616,
-                546616
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
deleted file mode 100644
index 501f64a004..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json
deleted file mode 100644
index 6ed2f71ffa..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            19,
-            1,
-            [
-                87892,
-                87892
-            ],
-            [
-                1578,
-                1578
-            ],
-            [
-                15648,
-                15648
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json
deleted file mode 100644
index bc4caba39e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            19,
-            1,
-            [
-                87892,
-                87892
-            ],
-            [
-                102,
-                102
-            ],
-            [
-                896,
-                896
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json
deleted file mode 100644
index e0337338d0..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            19,
-            1,
-            [
-                156088,
-                156088
-            ],
-            [
-                790,
-                790
-            ],
-            [
-                8256,
-                8256
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json
deleted file mode 100644
index 9f0230b683..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            303571
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            12,
-            1,
-            [
-                71936,
-                71936
-            ],
-            [
-                30814,
-                30814
-            ],
-            [
-                327232,
-                327232
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-lines/metrics.json
deleted file mode 100644
index 9f0230b683..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            303571
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            12,
-            1,
-            [
-                71936,
-                71936
-            ],
-            [
-                30814,
-                30814
-            ],
-            [
-                327232,
-                327232
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json
deleted file mode 100644
index d9e4fbe383..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            686859
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            19,
-            1,
-            [
-                36896,
-                36896
-            ],
-            [
-                26342,
-                26342
-            ],
-            [
-                306880,
-                306880
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json
deleted file mode 100644
index d4438ca802..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            344510
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            16,
-            25,
-            61,
-            1,
-            [
-                276736,
-                276736
-            ],
-            [
-                51862,
-                51862
-            ],
-            [
-                653248,
-                653248
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched/metrics.json
deleted file mode 100644
index 29bd850670..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            344510
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            16,
-            36,
-            61,
-            1,
-            [
-                413280,
-                413280
-            ],
-            [
-                7062,
-                7062
-            ],
-            [
-                88768,
-                88768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/empty/empty/metrics.json b/metrics/next-android-render-test-runner/render-tests/empty/empty/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/empty/empty/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/extent/1024-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/extent/1024-fill/metrics.json
deleted file mode 100644
index 705eaa2c4e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/extent/1024-fill/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                684,
-                684
-            ],
-            [
-                372,
-                372
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/extent/1024-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/extent/1024-line/metrics.json
deleted file mode 100644
index b0ad84b7b6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/extent/1024-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                25594,
-                25594
-            ],
-            [
-                45664,
-                45664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/extent/1024-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/extent/1024-symbol/metrics.json
deleted file mode 100644
index b5f9604d8e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/extent/1024-symbol/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            686859
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                22258,
-                22258
-            ],
-            [
-                45718,
-                45718
-            ],
-            [
-                609344,
-                609344
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json
deleted file mode 100644
index 3653638ee2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/feature-state/data-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/feature-state/data-expression/metrics.json
deleted file mode 100644
index f6bec0e045..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/feature-state/data-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                256,
-                256
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/feature-state/vector-source/metrics.json b/metrics/next-android-render-test-runner/render-tests/feature-state/vector-source/metrics.json
deleted file mode 100644
index 16026daceb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/feature-state/vector-source/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                49570,
-                49570
-            ],
-            [
-                198256,
-                198256
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-antialias/false/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-antialias/false/metrics.json
deleted file mode 100644
index ec5a832777..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-antialias/false/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/default/metrics.json
deleted file mode 100644
index ec5a832777..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/function/metrics.json
deleted file mode 100644
index ec5a832777..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/literal/metrics.json
deleted file mode 100644
index ec5a832777..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/multiply/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/multiply/metrics.json
deleted file mode 100644
index ec5a832777..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/multiply/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/opacity/metrics.json
deleted file mode 100644
index ec5a832777..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/opacity/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/property-function/metrics.json
deleted file mode 100644
index 8ae66783ec..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                364,
-                364
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json
deleted file mode 100644
index 424e3e22c8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            10,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                604,
-                604
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json
deleted file mode 100644
index 6e40c94905..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            24,
-            29,
-            25,
-            1,
-            [
-                458752,
-                458752
-            ],
-            [
-                910,
-                910
-            ],
-            [
-                3184,
-                3184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json
deleted file mode 100644
index 6e40c94905..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            24,
-            29,
-            25,
-            1,
-            [
-                458752,
-                458752
-            ],
-            [
-                910,
-                910
-            ],
-            [
-                3184,
-                3184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json
deleted file mode 100644
index 6e40c94905..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            24,
-            29,
-            25,
-            1,
-            [
-                458752,
-                458752
-            ],
-            [
-                910,
-                910
-            ],
-            [
-                3184,
-                3184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json
deleted file mode 100644
index ccd42b0dde..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            24,
-            29,
-            29,
-            1,
-            [
-                458752,
-                458752
-            ],
-            [
-                910,
-                910
-            ],
-            [
-                4192,
-                4192
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json
deleted file mode 100644
index ccd42b0dde..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            24,
-            29,
-            29,
-            1,
-            [
-                458752,
-                458752
-            ],
-            [
-                910,
-                910
-            ],
-            [
-                4192,
-                4192
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
deleted file mode 100644
index 5c12ec1c1e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            24,
-            29,
-            29,
-            1,
-            [
-                458752,
-                458752
-            ],
-            [
-                910,
-                910
-            ],
-            [
-                5200,
-                5200
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json
deleted file mode 100644
index 47ec0bb2c6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            13,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                3088,
-                3088
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json
deleted file mode 100644
index 47ec0bb2c6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            13,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                3088,
-                3088
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json
deleted file mode 100644
index 47ec0bb2c6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            13,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                3088,
-                3088
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
deleted file mode 100644
index 47ec0bb2c6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            13,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                3088,
-                3088
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json
deleted file mode 100644
index ffe069ce46..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            17,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                5104,
-                5104
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
deleted file mode 100644
index e3548b740c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            17,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                7120,
-                7120
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json
deleted file mode 100644
index 47ec0bb2c6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            13,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                3088,
-                3088
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json
deleted file mode 100644
index 47ec0bb2c6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            13,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                3088,
-                3088
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json
deleted file mode 100644
index 4f179c4d25..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            17,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                4096,
-                4096
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json
deleted file mode 100644
index 4f179c4d25..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            17,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                4096,
-                4096
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
deleted file mode 100644
index ffe069ce46..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            17,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                5104,
-                5104
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
deleted file mode 100644
index c272c32be1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            32,
-            15,
-            53,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                1462,
-                1462
-            ],
-            [
-                4048,
-                4048
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json
deleted file mode 100644
index da78bc6af7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            12,
-            15,
-            29,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                3088,
-                3088
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json
deleted file mode 100644
index e7b07b6e25..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            16,
-            13,
-            25,
-            1,
-            [
-                196608,
-                196608
-            ],
-            [
-                910,
-                910
-            ],
-            [
-                3184,
-                3184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json
deleted file mode 100644
index d0cf84edc1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            20,
-            13,
-            25,
-            1,
-            [
-                196608,
-                196608
-            ],
-            [
-                910,
-                910
-            ],
-            [
-                3184,
-                3184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json
deleted file mode 100644
index d0cf84edc1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            20,
-            13,
-            25,
-            1,
-            [
-                196608,
-                196608
-            ],
-            [
-                910,
-                910
-            ],
-            [
-                3184,
-                3184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json
deleted file mode 100644
index 808337bb3d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            25,
-            13,
-            1,
-            [
-                270336,
-                270336
-            ],
-            [
-                538,
-                538
-            ],
-            [
-                2200,
-                2200
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json
deleted file mode 100644
index 0fa0470318..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            22,
-            15,
-            25,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                390,
-                390
-            ],
-            [
-                1152,
-                1152
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
deleted file mode 100644
index 0fa0470318..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            22,
-            15,
-            25,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                390,
-                390
-            ],
-            [
-                1152,
-                1152
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json
deleted file mode 100644
index 082bdc32eb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            16,
-            9,
-            25,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                1126,
-                1126
-            ],
-            [
-                3328,
-                3328
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json
deleted file mode 100644
index 2c2af11696..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            12,
-            9,
-            25,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                1126,
-                1126
-            ],
-            [
-                3328,
-                3328
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
deleted file mode 100644
index 082bdc32eb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            16,
-            9,
-            25,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                1126,
-                1126
-            ],
-            [
-                3328,
-                3328
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json
deleted file mode 100644
index 2c2af11696..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            12,
-            9,
-            25,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                1126,
-                1126
-            ],
-            [
-                3328,
-                3328
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
deleted file mode 100644
index 1b222aa314..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            21,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                502,
-                502
-            ],
-            [
-                3424,
-                3424
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
deleted file mode 100644
index 1b222aa314..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            15,
-            21,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                502,
-                502
-            ],
-            [
-                3424,
-                3424
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/default/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/function/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/literal/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
deleted file mode 100644
index 6b55634a1c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            12,
-            1,
-            [
-                39168,
-                39168
-            ],
-            [
-                66,
-                66
-            ],
-            [
-                244,
-                244
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json
deleted file mode 100644
index f9de3e6600..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                150,
-                150
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json
deleted file mode 100644
index 0923fe04bb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22080,
-                22080
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                184,
-                184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json
deleted file mode 100644
index 19c5ef8507..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                184,
-                184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json
deleted file mode 100644
index 0800242842..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                244,
-                244
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/default/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/function/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json
deleted file mode 100644
index c3e66bb650..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                244,
-                244
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
deleted file mode 100644
index 0bf5f29188..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                364,
-                364
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json
deleted file mode 100644
index 51c11b8e4a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            77034
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            8,
-            1,
-            [
-                26256,
-                26256
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json
deleted file mode 100644
index 5b0f25c103..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                23680,
-                23680
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                484,
-                484
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json
deleted file mode 100644
index 714f677bd6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                36864,
-                36864
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                484,
-                484
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/missing/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/missing/metrics.json
deleted file mode 100644
index 07184a47f6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/missing/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            8,
-            1,
-            [
-                36864,
-                36864
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json
deleted file mode 100644
index 0b64b9c6e2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            403778
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            12,
-            13,
-            17,
-            1,
-            [
-                111488,
-                111488
-            ],
-            [
-                24058,
-                24058
-            ],
-            [
-                10024,
-                10024
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
deleted file mode 100644
index 8107ea6575..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            102998
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            8,
-            1,
-            [
-                25584,
-                25584
-            ],
-            [
-                17456,
-                17456
-            ],
-            [
-                6968,
-                6968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json
deleted file mode 100644
index a3bacd4632..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            25,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                406,
-                406
-            ],
-            [
-                1264,
-                1264
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json
deleted file mode 100644
index ec5a832777..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json
deleted file mode 100644
index ec5a832777..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-translate/default/metrics.json
deleted file mode 100644
index ec5a832777..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-translate/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-translate/function/metrics.json
deleted file mode 100644
index ec5a832777..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-translate/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-translate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-translate/literal/metrics.json
deleted file mode 100644
index ec5a832777..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-translate/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-visibility/none/metrics.json
deleted file mode 100644
index 9028b81da1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-visibility/none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            102265
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                17456,
-                17456
-            ],
-            [
-                6968,
-                6968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-visibility/visible/metrics.json
deleted file mode 100644
index 9028b81da1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/fill-visibility/visible/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            102265
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                17456,
-                17456
-            ],
-            [
-                6968,
-                6968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/filter/equality/metrics.json b/metrics/next-android-render-test-runner/render-tests/filter/equality/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/filter/equality/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/filter/legacy-equality/metrics.json b/metrics/next-android-render-test-runner/render-tests/filter/legacy-equality/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/filter/legacy-equality/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/filter/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/filter/none/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/filter/none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json
deleted file mode 100644
index 921bb22529..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            132851
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            14,
-            1,
-            [
-                40979,
-                40979
-            ],
-            [
-                1162,
-                1162
-            ],
-            [
-                11152,
-                11152
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/clustered/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/clustered/metrics.json
deleted file mode 100644
index e4de306451..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/clustered/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            132851
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            7,
-            21,
-            1,
-            [
-                74016,
-                74016
-            ],
-            [
-                2254,
-                2254
-            ],
-            [
-                13120,
-                13120
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/external-feature/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/external-feature/metrics.json
deleted file mode 100644
index 1f4a35b379..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/external-feature/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            9722
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                706,
-                706
-            ],
-            [
-                1040,
-                1040
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/external-invalid/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/external-invalid/metrics.json
deleted file mode 100644
index c050c4e8ce..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/external-invalid/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            3
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            5,
-            5,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/external-linestring/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/external-linestring/metrics.json
deleted file mode 100644
index 1f4a35b379..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/external-linestring/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            9722
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                706,
-                706
-            ],
-            [
-                1040,
-                1040
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/external-malformed/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/external-malformed/metrics.json
deleted file mode 100644
index c35eb5d526..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/external-malformed/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            152
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            5,
-            5,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json
deleted file mode 100644
index 92d02167a9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            691
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                278,
-                278
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-feature/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-feature/metrics.json
deleted file mode 100644
index 0d433cec13..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-feature/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                706,
-                706
-            ],
-            [
-                1040,
-                1040
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json
deleted file mode 100644
index 7da0796966..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            5,
-            5,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json
deleted file mode 100644
index 87bafb2c59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json
deleted file mode 100644
index b947079d6b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                176,
-                176
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json
deleted file mode 100644
index 7da0796966..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            5,
-            5,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json
deleted file mode 100644
index e204a192de..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json
deleted file mode 100644
index 676dd680b3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                26,
-                26
-            ],
-            [
-                68,
-                68
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json
deleted file mode 100644
index fb542cead0..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json
deleted file mode 100644
index d01fbee184..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json
deleted file mode 100644
index 5b035beb41..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json
deleted file mode 100644
index c031604857..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/missing/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/missing/metrics.json
deleted file mode 100644
index 7da0796966..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/missing/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            5,
-            5,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json
deleted file mode 100644
index f1bf8426ca..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            9722
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            4,
-            9,
-            1,
-            [
-                49152,
-                49152
-            ],
-            [
-                382,
-                382
-            ],
-            [
-                576,
-                576
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-color/default/metrics.json
deleted file mode 100644
index e300a2d0a6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                41984,
-                41984
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-color/expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-color/expression/metrics.json
deleted file mode 100644
index e300a2d0a6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-color/expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                41984,
-                41984
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json
deleted file mode 100644
index 098f2da894..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                50176,
-                50176
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json
deleted file mode 100644
index 098f2da894..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                50176,
-                50176
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json
deleted file mode 100644
index 098f2da894..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                50176,
-                50176
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json
deleted file mode 100644
index 4daf3ff957..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json
deleted file mode 100644
index 4daf3ff957..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json
deleted file mode 100644
index 4daf3ff957..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json
deleted file mode 100644
index 08b7ca1c86..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            9,
-            11,
-            2,
-            [
-                115712,
-                115712
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json
deleted file mode 100644
index e12b800462..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            8,
-            2,
-            [
-                35840,
-                35840
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/default/metrics.json
deleted file mode 100644
index 098f2da894..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                50176,
-                50176
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/function/metrics.json
deleted file mode 100644
index 098f2da894..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                50176,
-                50176
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json
deleted file mode 100644
index 098f2da894..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                50176,
-                50176
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json
deleted file mode 100644
index 098f2da894..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                50176,
-                50176
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-weight/default/metrics.json
deleted file mode 100644
index 098f2da894..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                50176,
-                50176
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json
deleted file mode 100644
index 3c0b3e0c7f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            8,
-            2,
-            [
-                50176,
-                50176
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                17472,
-                17472
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json
deleted file mode 100644
index 098f2da894..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            7,
-            2,
-            [
-                50176,
-                50176
-            ],
-            [
-                6550,
-                6550
-            ],
-            [
-                8768,
-                8768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json
deleted file mode 100644
index da22284860..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            570207
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            10,
-            5,
-            1,
-            [
-                2129984,
-                2129984
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json
deleted file mode 100644
index da22284860..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            570207
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            10,
-            5,
-            1,
-            [
-                2129984,
-                2129984
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json
deleted file mode 100644
index 0af7981529..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            138244
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            5,
-            1,
-            [
-                544784,
-                544784
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json
deleted file mode 100644
index da22284860..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            570207
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            10,
-            5,
-            1,
-            [
-                2129984,
-                2129984
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json
deleted file mode 100644
index da22284860..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            570207
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            10,
-            5,
-            1,
-            [
-                2129984,
-                2129984
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json
deleted file mode 100644
index da22284860..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            570207
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            10,
-            5,
-            1,
-            [
-                2129984,
-                2129984
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json
deleted file mode 100644
index da22284860..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            570207
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            10,
-            5,
-            1,
-            [
-                2129984,
-                2129984
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json
deleted file mode 100644
index da22284860..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            570207
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            10,
-            5,
-            1,
-            [
-                2129984,
-                2129984
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json
deleted file mode 100644
index da22284860..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            570207
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            10,
-            5,
-            1,
-            [
-                2129984,
-                2129984
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json
deleted file mode 100644
index da22284860..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            570207
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            10,
-            5,
-            1,
-            [
-                2129984,
-                2129984
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/center/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/center/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/center/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/default/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/left/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/left/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/left/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json
deleted file mode 100644
index 06c60d080b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                1504,
-                1504
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/right/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/right/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/right/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/top/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-color/default/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-color/function/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-color/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-color/literal/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-color/property-function/metrics.json
deleted file mode 100644
index 4c633b4237..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-color/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            10,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                448,
-                448
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json
deleted file mode 100644
index 836b87b16e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            10,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                416,
-                416
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/default/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/function/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json
deleted file mode 100644
index 77eaf96958..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            10,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                448,
-                448
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/default/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/function/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json
deleted file mode 100644
index 7f17773165..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json
deleted file mode 100644
index 836b87b16e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            10,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                416,
-                416
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
deleted file mode 100644
index 9689f98407..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                26720,
-                26720
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/image-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/image-expression/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/image-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/literal/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/property-function/metrics.json
deleted file mode 100644
index c291562544..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                25088,
-                25088
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json
deleted file mode 100644
index 253fc965aa..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            3380
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                27536,
-                27536
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                1648,
-                1648
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/stretchable/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/stretchable/metrics.json
deleted file mode 100644
index 253fc965aa..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/stretchable/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            3380
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                27536,
-                27536
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                1648,
-                1648
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/token/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/token/metrics.json
deleted file mode 100644
index c291562544..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/token/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                25088,
-                25088
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json
deleted file mode 100644
index ef86c597d3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            8,
-            29,
-            1,
-            [
-                42496,
-                42496
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                1024,
-                1024
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-offset/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-offset/literal/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-offset/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-offset/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-offset/property-function/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-offset/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/default/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/function/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json
deleted file mode 100644
index 9ff18b8ec1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                86992,
-                86992
-            ],
-            [
-                13582,
-                13582
-            ],
-            [
-                180864,
-                180864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/literal/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json
deleted file mode 100644
index 0760437163..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            10,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                416,
-                416
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json
deleted file mode 100644
index 9ff18b8ec1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                86992,
-                86992
-            ],
-            [
-                13582,
-                13582
-            ],
-            [
-                180864,
-                180864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json
deleted file mode 100644
index 9ff18b8ec1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                86992,
-                86992
-            ],
-            [
-                13582,
-                13582
-            ],
-            [
-                180864,
-                180864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
deleted file mode 100644
index fdaf27673e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
deleted file mode 100644
index fdaf27673e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
deleted file mode 100644
index fdaf27673e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
deleted file mode 100644
index fdaf27673e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json
deleted file mode 100644
index f1cb4ead5f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1517795
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                88320,
-                88320
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotate/literal/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotate/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json
deleted file mode 100644
index 6d7c07c46a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            12,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                50,
-                50
-            ],
-            [
-                320,
-                320
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
deleted file mode 100644
index fdaf27673e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
deleted file mode 100644
index fdaf27673e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
deleted file mode 100644
index fdaf27673e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
deleted file mode 100644
index fdaf27673e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
deleted file mode 100644
index fdaf27673e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
deleted file mode 100644
index fdaf27673e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json
deleted file mode 100644
index ff10b87fe6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/default/metrics.json
deleted file mode 100644
index e85e6b42dc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22080,
-                22080
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/function/metrics.json
deleted file mode 100644
index e85e6b42dc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22080,
-                22080
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/literal/metrics.json
deleted file mode 100644
index e85e6b42dc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22080,
-                22080
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json
deleted file mode 100644
index 6e8125cf62..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json
deleted file mode 100644
index 18164e288a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
deleted file mode 100644
index 533e640ba8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            4,
-            21,
-            1,
-            [
-                21937,
-                21937
-            ],
-            [
-                214,
-                214
-            ],
-            [
-                2624,
-                2624
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
deleted file mode 100644
index 27c166e4fa..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            17,
-            1,
-            [
-                21937,
-                21937
-            ],
-            [
-                190,
-                190
-            ],
-            [
-                2304,
-                2304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json
deleted file mode 100644
index f8a34973b4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            4,
-            21,
-            1,
-            [
-                21937,
-                21937
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                1344,
-                1344
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json
deleted file mode 100644
index 3731e0fcb2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                31249,
-                31249
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
deleted file mode 100644
index 60e56e89fb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            90364
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                21970,
-                21970
-            ],
-            [
-                562,
-                562
-            ],
-            [
-                5968,
-                5968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
deleted file mode 100644
index fd38a33aaf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            89590
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                19586,
-                19586
-            ],
-            [
-                562,
-                562
-            ],
-            [
-                5968,
-                5968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
deleted file mode 100644
index fd38a33aaf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            89590
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                19586,
-                19586
-            ],
-            [
-                562,
-                562
-            ],
-            [
-                5968,
-                5968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
deleted file mode 100644
index fd38a33aaf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            89590
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                19586,
-                19586
-            ],
-            [
-                562,
-                562
-            ],
-            [
-                5968,
-                5968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json
deleted file mode 100644
index fd38a33aaf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            89590
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                19586,
-                19586
-            ],
-            [
-                562,
-                562
-            ],
-            [
-                5968,
-                5968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both/metrics.json
deleted file mode 100644
index 3731e0fcb2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                31249,
-                31249
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
deleted file mode 100644
index d6bdd89b21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                24148,
-                24148
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                1504,
-                1504
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json
deleted file mode 100644
index d6bdd89b21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                24148,
-                24148
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                1504,
-                1504
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json
deleted file mode 100644
index d6bdd89b21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                24148,
-                24148
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                1504,
-                1504
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json
deleted file mode 100644
index d6bdd89b21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                24148,
-                24148
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                1504,
-                1504
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json
deleted file mode 100644
index 3731e0fcb2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                31249,
-                31249
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
deleted file mode 100644
index fd38a33aaf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            89590
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                19586,
-                19586
-            ],
-            [
-                562,
-                562
-            ],
-            [
-                5968,
-                5968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json
deleted file mode 100644
index fd38a33aaf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            89590
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                19586,
-                19586
-            ],
-            [
-                562,
-                562
-            ],
-            [
-                5968,
-                5968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height/metrics.json
deleted file mode 100644
index 3731e0fcb2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                31249,
-                31249
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/none/metrics.json
deleted file mode 100644
index 3731e0fcb2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                31249,
-                31249
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json
deleted file mode 100644
index f879907a01..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            817439
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            7,
-            21,
-            1,
-            [
-                136172,
-                136172
-            ],
-            [
-                5782,
-                5782
-            ],
-            [
-                76864,
-                76864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
deleted file mode 100644
index 37cfb3b5fd..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            88322
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                32193,
-                32193
-            ],
-            [
-                2182,
-                2182
-            ],
-            [
-                27568,
-                27568
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
deleted file mode 100644
index 52972bf07e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            88322
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                46993,
-                46993
-            ],
-            [
-                1534,
-                1534
-            ],
-            [
-                18928,
-                18928
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
deleted file mode 100644
index a96054ffb9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            88322
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                25825,
-                25825
-            ],
-            [
-                1426,
-                1426
-            ],
-            [
-                17488,
-                17488
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
deleted file mode 100644
index a96054ffb9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            88322
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                25825,
-                25825
-            ],
-            [
-                1426,
-                1426
-            ],
-            [
-                17488,
-                17488
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
deleted file mode 100644
index c410a69d19..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            88322
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                27153,
-                27153
-            ],
-            [
-                1966,
-                1966
-            ],
-            [
-                24688,
-                24688
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
deleted file mode 100644
index c410a69d19..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            88322
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                27153,
-                27153
-            ],
-            [
-                1966,
-                1966
-            ],
-            [
-                24688,
-                24688
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json
deleted file mode 100644
index 5bec05e584..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            88322
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                27153,
-                27153
-            ],
-            [
-                1534,
-                1534
-            ],
-            [
-                18928,
-                18928
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json
deleted file mode 100644
index 0cd910a99a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            88322
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                23073,
-                23073
-            ],
-            [
-                1534,
-                1534
-            ],
-            [
-                18928,
-                18928
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json
deleted file mode 100644
index 3e848e8533..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            88322
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                21633,
-                21633
-            ],
-            [
-                1534,
-                1534
-            ],
-            [
-                18928,
-                18928
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json
deleted file mode 100644
index 6048fc7e0b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            88322
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                19984,
-                19984
-            ],
-            [
-                1210,
-                1210
-            ],
-            [
-                14608,
-                14608
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json
deleted file mode 100644
index 3c52c61f52..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            817439
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            7,
-            21,
-            1,
-            [
-                136172,
-                136172
-            ],
-            [
-                63262,
-                63262
-            ],
-            [
-                843264,
-                843264
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json
deleted file mode 100644
index 3731e0fcb2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                31249,
-                31249
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
deleted file mode 100644
index fd38a33aaf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            89590
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                19586,
-                19586
-            ],
-            [
-                562,
-                562
-            ],
-            [
-                5968,
-                5968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json
deleted file mode 100644
index fd38a33aaf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            89590
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            4,
-            79,
-            1,
-            [
-                19586,
-                19586
-            ],
-            [
-                562,
-                562
-            ],
-            [
-                5968,
-                5968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width/metrics.json
deleted file mode 100644
index 3731e0fcb2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                31249,
-                31249
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json
deleted file mode 100644
index 40b289ac73..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            919278
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            7,
-            13,
-            1,
-            [
-                45568,
-                45568
-            ],
-            [
-                1366,
-                1366
-            ],
-            [
-                17984,
-                17984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json
deleted file mode 100644
index 40b289ac73..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            919278
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            7,
-            13,
-            1,
-            [
-                45568,
-                45568
-            ],
-            [
-                1366,
-                1366
-            ],
-            [
-                17984,
-                17984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-translate/default/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-translate/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-translate/function/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-translate/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-translate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-translate/literal/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-translate/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-visibility/none/metrics.json
deleted file mode 100644
index 95a181bd8c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-visibility/none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            5,
-            5,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-visibility/visible/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/icon-visibility/visible/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/image/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/default/metrics.json
deleted file mode 100644
index e64a2bba0e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/image/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            6,
-            7,
-            1,
-            [
-                2139136,
-                2139136
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/image/pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/pitched/metrics.json
deleted file mode 100644
index 40cff205c7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/image/pitched/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            13,
-            7,
-            1,
-            [
-                2253824,
-                2253824
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-brightness/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-brightness/metrics.json
deleted file mode 100644
index e64a2bba0e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-brightness/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            6,
-            7,
-            1,
-            [
-                2139136,
-                2139136
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-contrast/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-contrast/metrics.json
deleted file mode 100644
index e64a2bba0e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-contrast/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            6,
-            7,
-            1,
-            [
-                2139136,
-                2139136
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json
deleted file mode 100644
index e64a2bba0e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            6,
-            7,
-            1,
-            [
-                2139136,
-                2139136
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-opacity/metrics.json
deleted file mode 100644
index e64a2bba0e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-opacity/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            6,
-            7,
-            1,
-            [
-                2139136,
-                2139136
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-resampling/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-resampling/metrics.json
deleted file mode 100644
index 20c05495d7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-resampling/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                2089984,
-                2089984
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-saturation/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-saturation/metrics.json
deleted file mode 100644
index e64a2bba0e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-saturation/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            6,
-            7,
-            1,
-            [
-                2139136,
-                2139136
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-visibility/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-visibility/metrics.json
deleted file mode 100644
index e64a2bba0e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-visibility/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            6,
-            7,
-            1,
-            [
-                2139136,
-                2139136
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/is-supported-script/filter/metrics.json b/metrics/next-android-render-test-runner/render-tests/is-supported-script/filter/metrics.json
deleted file mode 100644
index a2ea9c5fb7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/is-supported-script/filter/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            159421
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                37304,
-                37304
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                864,
-                864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/is-supported-script/layout/metrics.json b/metrics/next-android-render-test-runner/render-tests/is-supported-script/layout/metrics.json
deleted file mode 100644
index f7dd7ee4c0..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/is-supported-script/layout/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            244363
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                45312,
-                45312
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                2944,
-                2944
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-blur/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-blur/default/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-blur/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-blur/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-blur/function/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-blur/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-blur/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-blur/literal/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-blur/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-blur/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-blur/property-function/metrics.json
deleted file mode 100644
index 3a79bf0708..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-blur/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                236656,
-                236656
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-cap/butt/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-cap/butt/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-cap/butt/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-cap/round/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-cap/round/metrics.json
deleted file mode 100644
index b8fd663961..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-cap/round/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                147154,
-                147154
-            ],
-            [
-                235232,
-                235232
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-cap/square/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-cap/square/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-cap/square/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-color/default/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-color/function/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-color/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-color/literal/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json
deleted file mode 100644
index 870d30daeb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                512,
-                512
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-color/property-function/metrics.json
deleted file mode 100644
index b8b502e177..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-color/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                315520,
-                315520
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/default/metrics.json
deleted file mode 100644
index f116462d86..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json
deleted file mode 100644
index fc7077f38f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            7,
-            1,
-            [
-                33024,
-                33024
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
deleted file mode 100644
index 089003ecce..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                33024,
-                33024
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                352,
-                352
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json
deleted file mode 100644
index a687132530..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            10,
-            13,
-            1,
-            [
-                131584,
-                131584
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                192,
-                192
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json
deleted file mode 100644
index 2b8782c818..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                33024,
-                33024
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                256,
-                256
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
deleted file mode 100644
index 089003ecce..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                33024,
-                33024
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                352,
-                352
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json
deleted file mode 100644
index 45bcb8f0af..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            11,
-            1,
-            [
-                65792,
-                65792
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
deleted file mode 100644
index 2b8782c818..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                33024,
-                33024
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                256,
-                256
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
deleted file mode 100644
index fc7077f38f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            7,
-            1,
-            [
-                33024,
-                33024
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json
deleted file mode 100644
index 22bd3284bd..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            10,
-            9,
-            1,
-            [
-                131328,
-                131328
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json
deleted file mode 100644
index 747a2afbe1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            5,
-            7,
-            1,
-            [
-                49408,
-                49408
-            ],
-            [
-                27214,
-                27214
-            ],
-            [
-                47824,
-                47824
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json
deleted file mode 100644
index d3af311705..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                36864,
-                36864
-            ],
-            [
-                202,
-                202
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json
deleted file mode 100644
index d3af311705..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                36864,
-                36864
-            ],
-            [
-                202,
-                202
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/slant/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/slant/metrics.json
deleted file mode 100644
index 5e55b94da8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/slant/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            339472
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            7,
-            1,
-            [
-                33024,
-                33024
-            ],
-            [
-                190054,
-                190054
-            ],
-            [
-                268576,
-                268576
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json
deleted file mode 100644
index b4f03708c4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            11,
-            15,
-            1,
-            [
-                147712,
-                147712
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                352,
-                352
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gap-width/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gap-width/default/metrics.json
deleted file mode 100644
index d3fc353795..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-gap-width/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                240,
-                240
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gap-width/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gap-width/function/metrics.json
deleted file mode 100644
index d3fc353795..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-gap-width/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                240,
-                240
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gap-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gap-width/literal/metrics.json
deleted file mode 100644
index d3fc353795..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-gap-width/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                240,
-                240
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json
deleted file mode 100644
index 3a79bf0708..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                236656,
-                236656
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gradient/gradient/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gradient/gradient/metrics.json
deleted file mode 100644
index 2452c64b4a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-gradient/gradient/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            10,
-            13,
-            1,
-            [
-                132096,
-                132096
-            ],
-            [
-                1654,
-                1654
-            ],
-            [
-                2304,
-                2304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gradient/translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gradient/translucent/metrics.json
deleted file mode 100644
index 2452c64b4a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-gradient/translucent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            10,
-            13,
-            1,
-            [
-                132096,
-                132096
-            ],
-            [
-                1654,
-                1654
-            ],
-            [
-                2304,
-                2304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json
deleted file mode 100644
index 418bfd0dac..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                226,
-                226
-            ],
-            [
-                416,
-                416
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/bevel/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/bevel/metrics.json
deleted file mode 100644
index 418bfd0dac..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-join/bevel/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                226,
-                226
-            ],
-            [
-                416,
-                416
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/default/metrics.json
deleted file mode 100644
index 418bfd0dac..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-join/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                226,
-                226
-            ],
-            [
-                416,
-                416
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json
deleted file mode 100644
index 418bfd0dac..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                226,
-                226
-            ],
-            [
-                416,
-                416
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/miter/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/miter/metrics.json
deleted file mode 100644
index 418bfd0dac..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-join/miter/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                226,
-                226
-            ],
-            [
-                416,
-                416
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json
deleted file mode 100644
index c43da97741..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            7,
-            1,
-            [
-                33024,
-                33024
-            ],
-            [
-                394,
-                394
-            ],
-            [
-                624,
-                624
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/property-function/metrics.json
deleted file mode 100644
index 58f534192f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-join/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                394,
-                394
-            ],
-            [
-                624,
-                624
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/round-transparent/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/round-transparent/metrics.json
deleted file mode 100644
index 8bb30bb81b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-join/round-transparent/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                274,
-                274
-            ],
-            [
-                528,
-                528
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/round/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/round/metrics.json
deleted file mode 100644
index 8bb30bb81b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-join/round/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                274,
-                274
-            ],
-            [
-                528,
-                528
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-offset/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-offset/default/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-offset/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-offset/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-offset/function/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-offset/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-offset/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-offset/literal/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-offset/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-offset/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-offset/property-function/metrics.json
deleted file mode 100644
index 3a79bf0708..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-offset/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                236656,
-                236656
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-opacity/default/metrics.json
deleted file mode 100644
index d3fc353795..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-opacity/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                240,
-                240
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-opacity/function/metrics.json
deleted file mode 100644
index d3fc353795..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-opacity/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                240,
-                240
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-opacity/literal/metrics.json
deleted file mode 100644
index d3fc353795..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-opacity/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                240,
-                240
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-opacity/property-function/metrics.json
deleted file mode 100644
index 3a79bf0708..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-opacity/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                236656,
-                236656
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json
deleted file mode 100644
index 49ecdaab98..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                256,
-                256
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/@2x/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/@2x/metrics.json
deleted file mode 100644
index 5163e6758e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/@2x/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            77034
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            8,
-            11,
-            1,
-            [
-                46000,
-                46000
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/literal/metrics.json
deleted file mode 100644
index d4020db05c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            8,
-            11,
-            1,
-            [
-                33472,
-                33472
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/pitch/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/pitch/metrics.json
deleted file mode 100644
index d108f774d1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/pitch/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            426181
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            6,
-            7,
-            1,
-            [
-                54848,
-                54848
-            ],
-            [
-                27214,
-                27214
-            ],
-            [
-                47824,
-                47824
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/property-function/metrics.json
deleted file mode 100644
index 136c147615..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            25,
-            1,
-            [
-                94720,
-                94720
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                1600,
-                1600
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json
deleted file mode 100644
index fbbd2176a9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            25,
-            1,
-            [
-                101120,
-                101120
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                1600,
-                1600
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json
deleted file mode 100644
index 94e778f0b4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            13,
-            1,
-            [
-                88320,
-                88320
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                448,
-                448
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pitch/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pitch/default/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-pitch/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-sort-key/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-sort-key/literal/metrics.json
deleted file mode 100644
index 12a7598851..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-sort-key/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                832,
-                832
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json
deleted file mode 100644
index 5500efb294..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            707619
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            9,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                49138,
-                49138
-            ],
-            [
-                86192,
-                86192
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json
deleted file mode 100644
index 5500efb294..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            707619
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            9,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                49138,
-                49138
-            ],
-            [
-                86192,
-                86192
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-translate/default/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-translate/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-translate/function/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-translate/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-triangulation/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-triangulation/default/metrics.json
deleted file mode 100644
index 8e3ab38a23..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-triangulation/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                1342,
-                1342
-            ],
-            [
-                1920,
-                1920
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-triangulation/round/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-triangulation/round/metrics.json
deleted file mode 100644
index 9d54981560..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-triangulation/round/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                2542,
-                2542
-            ],
-            [
-                3728,
-                3728
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-visibility/none/metrics.json
deleted file mode 100644
index 50f1262c46..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-visibility/none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-visibility/visible/metrics.json
deleted file mode 100644
index 5500efb294..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-visibility/visible/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            707619
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            9,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                49138,
-                49138
-            ],
-            [
-                86192,
-                86192
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/default/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-width/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/function/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-width/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/literal/metrics.json
deleted file mode 100644
index 37218777d2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-width/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                157792,
-                157792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/property-function/metrics.json
deleted file mode 100644
index e66ff128ba..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-width/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            21,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                89074,
-                89074
-            ],
-            [
-                315520,
-                315520
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json
deleted file mode 100644
index b93dcb8232..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                28078,
-                28078
-            ],
-            [
-                48976,
-                48976
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json
deleted file mode 100644
index c6cefecd17..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            21,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                1654,
-                1654
-            ],
-            [
-                4544,
-                4544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/zero-width/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/zero-width/metrics.json
deleted file mode 100644
index 2712b0b4fe..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/line-width/zero-width/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                1654,
-                1654
-            ],
-            [
-                2304,
-                2304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json
deleted file mode 100644
index bf9483fb78..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                96320,
-                96320
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/map-mode/static/metrics.json b/metrics/next-android-render-test-runner/render-tests/map-mode/static/metrics.json
deleted file mode 100644
index 290ed6328f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/map-mode/static/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            475200
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                37326,
-                37326
-            ],
-            [
-                5494,
-                5494
-            ],
-            [
-                73024,
-                73024
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/next-android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json
deleted file mode 100644
index 199ebad897..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            8,
-            246523
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            103,
-            15,
-            207,
-            1,
-            [
-                207972,
-                207972
-            ],
-            [
-                162572,
-                162572
-            ],
-            [
-                512168,
-                512168
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/map-mode/tile/metrics.json b/metrics/next-android-render-test-runner/render-tests/map-mode/tile/metrics.json
deleted file mode 100644
index 3510a6a2db..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/map-mode/tile/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            475200
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                37326,
-                37326
-            ],
-            [
-                11542,
-                11542
-            ],
-            [
-                153664,
-                153664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json b/metrics/next-android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json
deleted file mode 100644
index da78bc6af7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            12,
-            15,
-            29,
-            1,
-            [
-                229376,
-                229376
-            ],
-            [
-                742,
-                742
-            ],
-            [
-                3088,
-                3088
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/projection/axonometric/metrics.json b/metrics/next-android-render-test-runner/render-tests/projection/axonometric/metrics.json
deleted file mode 100644
index b82f4dfc18..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/projection/axonometric/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                982,
-                982
-            ],
-            [
-                4096,
-                4096
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/projection/perspective/metrics.json b/metrics/next-android-render-test-runner/render-tests/projection/perspective/metrics.json
deleted file mode 100644
index b82f4dfc18..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/projection/perspective/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                982,
-                982
-            ],
-            [
-                4096,
-                4096
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/projection/skew/metrics.json b/metrics/next-android-render-test-runner/render-tests/projection/skew/metrics.json
deleted file mode 100644
index b82f4dfc18..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/projection/skew/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                982,
-                982
-            ],
-            [
-                4096,
-                4096
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-alpha/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-alpha/default/metrics.json
deleted file mode 100644
index 08d8297db8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-alpha/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            726906
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            9,
-            5,
-            1,
-            [
-                1605632,
-                1605632
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-brightness/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-brightness/default/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-brightness/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-brightness/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-brightness/function/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-brightness/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-brightness/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-brightness/literal/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-brightness/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-contrast/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-contrast/default/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-contrast/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-contrast/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-contrast/function/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-contrast/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-contrast/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-contrast/literal/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-contrast/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json
deleted file mode 100644
index 50f1262c46..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json
deleted file mode 100644
index 50f1262c46..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-loading/missing/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-loading/missing/metrics.json
deleted file mode 100644
index 4bd248b8fa..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-loading/missing/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            48534
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            5,
-            1,
-            [
-                278528,
-                278528
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json
deleted file mode 100644
index 12c856a698..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            14,
-            188423
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            16,
-            13,
-            23,
-            1,
-            [
-                1179648,
-                1179648
-            ],
-            [
-                294,
-                294
-            ],
-            [
-                528,
-                528
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json
deleted file mode 100644
index c0ad63d409..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            14,
-            188423
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            9,
-            11,
-            1,
-            [
-                1114112,
-                1114112
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                448,
-                448
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-opacity/default/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-opacity/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-opacity/function/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-opacity/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-opacity/literal/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-opacity/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-resampling/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-resampling/default/metrics.json
deleted file mode 100644
index 72910f7b10..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-resampling/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            48534
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            5,
-            1,
-            [
-                278528,
-                278528
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-resampling/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-resampling/function/metrics.json
deleted file mode 100644
index 72910f7b10..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-resampling/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            48534
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            5,
-            1,
-            [
-                278528,
-                278528
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-resampling/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-resampling/literal/metrics.json
deleted file mode 100644
index 72910f7b10..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-resampling/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            48534
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            5,
-            1,
-            [
-                278528,
-                278528
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-rotation/0/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-rotation/0/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-rotation/0/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-rotation/180/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-rotation/180/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-rotation/180/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-rotation/270/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-rotation/270/metrics.json
deleted file mode 100644
index 0d1ecd1833..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-rotation/270/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            22,
-            284856
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            8,
-            7,
-            1,
-            [
-                1343488,
-                1343488
-            ],
-            [
-                598,
-                598
-            ],
-            [
-                1600,
-                1600
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-rotation/45/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-rotation/45/metrics.json
deleted file mode 100644
index b4c21ad5c9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-rotation/45/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            22,
-            333591
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            10,
-            7,
-            1,
-            [
-                1622016,
-                1622016
-            ],
-            [
-                622,
-                622
-            ],
-            [
-                1664,
-                1664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-rotation/90/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-rotation/90/metrics.json
deleted file mode 100644
index 0d1ecd1833..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-rotation/90/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            22,
-            284856
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            8,
-            7,
-            1,
-            [
-                1343488,
-                1343488
-            ],
-            [
-                598,
-                598
-            ],
-            [
-                1600,
-                1600
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-saturation/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-saturation/default/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-saturation/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-saturation/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-saturation/function/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-saturation/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-saturation/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-saturation/literal/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-saturation/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-visibility/none/metrics.json
deleted file mode 100644
index db64850e38..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-visibility/none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-visibility/visible/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/raster-visibility/visible/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/real-world/nepal/metrics.json b/metrics/next-android-render-test-runner/render-tests/real-world/nepal/metrics.json
deleted file mode 100644
index f1142e011c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/real-world/nepal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            8,
-            416139
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            26,
-            12,
-            42,
-            1,
-            [
-                152370,
-                152370
-            ],
-            [
-                499026,
-                499026
-            ],
-            [
-                678436,
-                678436
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/real-world/norway/metrics.json b/metrics/next-android-render-test-runner/render-tests/real-world/norway/metrics.json
deleted file mode 100644
index 45badb494a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/real-world/norway/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            147533
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            19,
-            9,
-            31,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                57816,
-                57816
-            ],
-            [
-                61348,
-                61348
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/real-world/uruguay/metrics.json b/metrics/next-android-render-test-runner/render-tests/real-world/uruguay/metrics.json
deleted file mode 100644
index 8c183cc9f3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/real-world/uruguay/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            9,
-            284875
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            36,
-            13,
-            63,
-            1,
-            [
-                240136,
-                240136
-            ],
-            [
-                68598,
-                68598
-            ],
-            [
-                79296,
-                79296
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json
deleted file mode 100644
index 96bd9fd98f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            403778
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            16,
-            9,
-            17,
-            1,
-            [
-                147456,
-                147456
-            ],
-            [
-                24058,
-                24058
-            ],
-            [
-                10024,
-                10024
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json
deleted file mode 100644
index a48098b4aa..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1602737
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            21,
-            1,
-            [
-                159696,
-                159696
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json
deleted file mode 100644
index c527b4e09d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            138188
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            8,
-            1,
-            [
-                22080,
-                22080
-            ],
-            [
-                17456,
-                17456
-            ],
-            [
-                6968,
-                6968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json
deleted file mode 100644
index 7d15d2a7ad..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            138188
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                17456,
-                17456
-            ],
-            [
-                6968,
-                6968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json
deleted file mode 100644
index 19c5ef8507..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                184,
-                184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json
deleted file mode 100644
index 2052d5d52e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            29,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                256,
-                256
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json
deleted file mode 100644
index 20c05495d7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                2089984,
-                2089984
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json
deleted file mode 100644
index fab92536d4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            8,
-            1,
-            [
-                22080,
-                22080
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json
deleted file mode 100644
index bcc2a3f74f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                86,
-                86
-            ],
-            [
-                104,
-                104
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json
deleted file mode 100644
index 09d52d402e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                38222,
-                38222
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                2944,
-                2944
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json
deleted file mode 100644
index 65f07ee533..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                33767,
-                33767
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json
deleted file mode 100644
index c217fdfc61..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            7,
-            1,
-            [
-                33024,
-                33024
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json
deleted file mode 100644
index 6e40c94905..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            24,
-            29,
-            25,
-            1,
-            [
-                458752,
-                458752
-            ],
-            [
-                910,
-                910
-            ],
-            [
-                3184,
-                3184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json
deleted file mode 100644
index 3520563149..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            511123
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            7,
-            5,
-            15,
-            1,
-            [
-                68596,
-                68596
-            ],
-            [
-                8362,
-                8362
-            ],
-            [
-                39412,
-                39412
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json
deleted file mode 100644
index 2e017e0a39..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            293306
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            5,
-            1,
-            [
-                1064960,
-                1064960
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json
deleted file mode 100644
index bc237525bb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            12,
-            17,
-            1,
-            [
-                125574,
-                125574
-            ],
-            [
-                454,
-                454
-            ],
-            [
-                5824,
-                5824
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json
deleted file mode 100644
index e204a192de..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json
deleted file mode 100644
index 16485ab8b4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                33024,
-                33024
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json
deleted file mode 100644
index 0500eb4873..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            15,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                364,
-                364
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json
deleted file mode 100644
index a01add499e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            484604
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            5,
-            1,
-            [
-                1064960,
-                1064960
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json
deleted file mode 100644
index 50f1262c46..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json
deleted file mode 100644
index ca19895c81..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json
deleted file mode 100644
index f9443ff76e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json
deleted file mode 100644
index d4eae54455..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                49152,
-                49152
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json
deleted file mode 100644
index d4eae54455..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                49152,
-                49152
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json
deleted file mode 100644
index d4eae54455..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                49152,
-                49152
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json
deleted file mode 100644
index 485b59ab36..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            17,
-            1,
-            [
-                81920,
-                81920
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                256,
-                256
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json
deleted file mode 100644
index 3468eac0f2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json
deleted file mode 100644
index ba3ca00114..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            9,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json
deleted file mode 100644
index 20c05495d7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                2089984,
-                2089984
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json
deleted file mode 100644
index b3e8b26951..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            7,
-            1,
-            [
-                2106368,
-                2106368
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json
deleted file mode 100644
index 54f55f390d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                26614,
-                26614
-            ],
-            [
-                47024,
-                47024
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json
deleted file mode 100644
index 20c05495d7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            949368
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                2089984,
-                2089984
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json
deleted file mode 100644
index 5068fa89b0..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json
deleted file mode 100644
index 026b6be031..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            13,
-            9,
-            1,
-            [
-                132836,
-                132836
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json
deleted file mode 100644
index 026b6be031..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            13,
-            9,
-            1,
-            [
-                132836,
-                132836
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json
deleted file mode 100644
index ca4687f419..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            12,
-            1,
-            [
-                35828,
-                35828
-            ],
-            [
-                86,
-                86
-            ],
-            [
-                800,
-                800
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json
deleted file mode 100644
index 77e26663ad..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                144,
-                144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json
deleted file mode 100644
index 2a11129cdd..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            7,
-            13,
-            1,
-            [
-                71656,
-                71656
-            ],
-            [
-                214,
-                214
-            ],
-            [
-                2624,
-                2624
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json
deleted file mode 100644
index e78c748008..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            2098
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                24576,
-                24576
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json
deleted file mode 100644
index 5e66f07df0..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            293306
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            7,
-            8,
-            1,
-            [
-                1081344,
-                1081344
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json
deleted file mode 100644
index 20fa03d324..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            191095
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            11,
-            13,
-            25,
-            1,
-            [
-                134432,
-                134432
-            ],
-            [
-                958,
-                958
-            ],
-            [
-                10240,
-                10240
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json
deleted file mode 100644
index 6b144b9538..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            41,
-            7971260
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            9,
-            10,
-            23,
-            1,
-            [
-                244884,
-                244884
-            ],
-            [
-                2926,
-                2926
-            ],
-            [
-                36736,
-                36736
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json
deleted file mode 100644
index 63e089963e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json
deleted file mode 100644
index 4ab1b5696c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            17,
-            1,
-            [
-                23146,
-                23146
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                1344,
-                1344
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json
deleted file mode 100644
index 7ce4c13248..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            87709
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                30034,
-                30034
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json
deleted file mode 100644
index 2ce8e21873..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            17,
-            1,
-            [
-                42608,
-                42608
-            ],
-            [
-                550,
-                550
-            ],
-            [
-                7104,
-                7104
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json
deleted file mode 100644
index 25b998e4f8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            45,
-            19,
-            1,
-            [
-                662656,
-                662656
-            ],
-            [
-                438,
-                438
-            ],
-            [
-                5376,
-                5376
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json
deleted file mode 100644
index 9c7a3359c2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json
deleted file mode 100644
index 7b8e778406..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            6,
-            9,
-            1,
-            [
-                27632,
-                27632
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                256,
-                256
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json
deleted file mode 100644
index f8108ef92f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                20013,
-                20013
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json
deleted file mode 100644
index 64d5fea021..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                38222,
-                38222
-            ],
-            [
-                178,
-                178
-            ],
-            [
-                2144,
-                2144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json
deleted file mode 100644
index 89aa855d36..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                320,
-                320
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json
deleted file mode 100644
index 0206fc826f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35828,
-                35828
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json
deleted file mode 100644
index 2e13bfe1c8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            183111
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            7,
-            9,
-            1,
-            [
-                92941,
-                92941
-            ],
-            [
-                358,
-                358
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json
deleted file mode 100644
index 693f787042..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            17,
-            1,
-            [
-                29056,
-                29056
-            ],
-            [
-                406,
-                406
-            ],
-            [
-                5184,
-                5184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json
deleted file mode 100644
index 2e92924579..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            7,
-            1,
-            [
-                22080,
-                22080
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json
deleted file mode 100644
index a5407ceb76..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                214,
-                214
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json
deleted file mode 100644
index a80aa837e4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json
deleted file mode 100644
index 501f64a004..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                22328,
-                22328
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json
deleted file mode 100644
index 0be45de845..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            85003
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                40339,
-                40339
-            ],
-            [
-                262,
-                262
-            ],
-            [
-                3264,
-                3264
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json
deleted file mode 100644
index 89ccfdbed1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            13,
-            9,
-            1,
-            [
-                171072,
-                171072
-            ],
-            [
-                250,
-                250
-            ],
-            [
-                3104,
-                3104
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json
deleted file mode 100644
index 98442c7f49..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                49152,
-                49152
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json
deleted file mode 100644
index 5cb2eb8428..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            7,
-            1,
-            [
-                42024,
-                42024
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                176,
-                176
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json
deleted file mode 100644
index fb4e5552f7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            240453
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            5,
-            11,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                34890,
-                34890
-            ],
-            [
-                13872,
-                13872
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json
deleted file mode 100644
index ad0cf8a267..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            4,
-            5,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json
deleted file mode 100644
index bb8ac85388..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                176,
-                176
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json
deleted file mode 100644
index daa3b24ba1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            100273
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33768,
-                33768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json
deleted file mode 100644
index e85e6b42dc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22080,
-                22080
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json
deleted file mode 100644
index 38eab4e78e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            35923
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                22080,
-                22080
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json
deleted file mode 100644
index 2bd3523e27..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            9,
-            1,
-            [
-                49152,
-                49152
-            ],
-            [
-                454,
-                454
-            ],
-            [
-                720,
-                720
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json
deleted file mode 100644
index 16c62d33f5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            5,
-            11,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json
deleted file mode 100644
index d4eae54455..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                49152,
-                49152
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json
deleted file mode 100644
index 50f1262c46..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json
deleted file mode 100644
index ecd1b9eaf5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json
deleted file mode 100644
index 7da0796966..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            5,
-            5,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json
deleted file mode 100644
index 4e5b247b07..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                112,
-                112
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json
deleted file mode 100644
index 7f54e74803..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1478
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21264,
-                21264
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json
deleted file mode 100644
index 6de6aa8e28..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            739
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21264,
-                21264
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json
deleted file mode 100644
index 662a5ca35c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            11,
-            17,
-            1,
-            [
-                163840,
-                163840
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                288,
-                288
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json
deleted file mode 100644
index 5068fa89b0..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
deleted file mode 100644
index eb891b578e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            8,
-            1,
-            [
-                33024,
-                33024
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json
deleted file mode 100644
index 3653638ee2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json
deleted file mode 100644
index f6bec0e045..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                256,
-                256
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/next-android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json
deleted file mode 100644
index 16026daceb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            1481872
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                49570,
-                49570
-            ],
-            [
-                198256,
-                198256
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/retina-raster/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/retina-raster/default/metrics.json
deleted file mode 100644
index 10305579d1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/retina-raster/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            192641
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            7,
-            5,
-            1,
-            [
-                1081344,
-                1081344
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json
deleted file mode 100644
index 7d39e18295..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json
deleted file mode 100644
index 7d39e18295..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
deleted file mode 100644
index 4deb44f270..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            3377
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                31488,
-                31488
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
deleted file mode 100644
index 4deb44f270..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            3377
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                31488,
-                31488
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
deleted file mode 100644
index 6faf862e93..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            1010
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                25584,
-                25584
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
deleted file mode 100644
index 6faf862e93..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            1010
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                25584,
-                25584
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
deleted file mode 100644
index e0baa0c9f5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            1995
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                39632,
-                39632
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
deleted file mode 100644
index e0baa0c9f5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            1995
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                39632,
-                39632
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json
deleted file mode 100644
index 7b309facc7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            1307
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22592,
-                22592
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json
deleted file mode 100644
index 672f6c43ed..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            816
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                80016,
-                80016
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json
deleted file mode 100644
index 672f6c43ed..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            816
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                80016,
-                80016
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json
deleted file mode 100644
index ac4b3251ff..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            951466
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                24576,
-                24576
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json
deleted file mode 100644
index 9b2e396f8e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            38021
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                24576,
-                24576
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json
deleted file mode 100644
index ca19895c81..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json
deleted file mode 100644
index bb8ac85388..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                176,
-                176
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json
deleted file mode 100644
index 2e017e0a39..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            293306
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            5,
-            1,
-            [
-                1064960,
-                1064960
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json
deleted file mode 100644
index d1d3c719b6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
deleted file mode 100644
index 7d39e18295..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
deleted file mode 100644
index c4c12ce6cc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            10,
-            1,
-            [
-                37068,
-                37068
-            ],
-            [
-                154,
-                154
-            ],
-            [
-                2176,
-                2176
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
deleted file mode 100644
index ded111d5db..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            10,
-            1,
-            [
-                39368,
-                39368
-            ],
-            [
-                154,
-                154
-            ],
-            [
-                2176,
-                2176
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
deleted file mode 100644
index 7c2bcc88a9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                560,
-                560
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
deleted file mode 100644
index 7d39e18295..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
deleted file mode 100644
index 7d39e18295..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
deleted file mode 100644
index 869c4378bf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                316,
-                316
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
deleted file mode 100644
index 23b829f168..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            10,
-            1,
-            [
-                37167,
-                37167
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                1792,
-                1792
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
deleted file mode 100644
index 47108b29bc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            10,
-            1,
-            [
-                36170,
-                36170
-            ],
-            [
-                106,
-                106
-            ],
-            [
-                1408,
-                1408
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
deleted file mode 100644
index 9d89d5f2f3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            10,
-            1,
-            [
-                42488,
-                42488
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                1984,
-                1984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
deleted file mode 100644
index 2b00a4fa06..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
deleted file mode 100644
index 2b00a4fa06..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                160,
-                160
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
deleted file mode 100644
index 7d39e18295..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
deleted file mode 100644
index 7d39e18295..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json
deleted file mode 100644
index dea2cb3857..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            83,
-            16423893
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            7,
-            9,
-            1,
-            [
-                2973366,
-                2973366
-            ],
-            [
-                30022,
-                30022
-            ],
-            [
-                400064,
-                400064
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
deleted file mode 100644
index 873f47815f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                54,
-                54
-            ],
-            [
-                84,
-                84
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
deleted file mode 100644
index bb8ac85388..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                176,
-                176
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
deleted file mode 100644
index 2e017e0a39..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            293306
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            5,
-            1,
-            [
-                1064960,
-                1064960
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
deleted file mode 100644
index e0426e7b51..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                70598,
-                70598
-            ],
-            [
-                37328,
-                37328
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
deleted file mode 100644
index e204a192de..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
deleted file mode 100644
index d1d3c719b6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
deleted file mode 100644
index ecd1b9eaf5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
deleted file mode 100644
index 7d39e18295..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
deleted file mode 100644
index 43f81ae9e8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                21120,
-                21120
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
deleted file mode 100644
index 7d39e18295..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
deleted file mode 100644
index 7d39e18295..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
deleted file mode 100644
index fea6fe2e59..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                22784,
-                22784
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
deleted file mode 100644
index 869c4378bf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                316,
-                316
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
deleted file mode 100644
index bf5b94a725..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
deleted file mode 100644
index b7fcd04541..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                96,
-                96
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
deleted file mode 100644
index 7f4a046639..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            59
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
deleted file mode 100644
index 2e017e0a39..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            293306
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            5,
-            1,
-            [
-                1064960,
-                1064960
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
deleted file mode 100644
index 95c3df52a8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            293387
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            5,
-            1,
-            [
-                1064960,
-                1064960
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
deleted file mode 100644
index 9028b81da1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            102265
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                17456,
-                17456
-            ],
-            [
-                6968,
-                6968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
deleted file mode 100644
index 848e2d81c4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            102336
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                17456,
-                17456
-            ],
-            [
-                6968,
-                6968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json
deleted file mode 100644
index 79e7810486..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                91136,
-                91136
-            ],
-            [
-                2734,
-                2734
-            ],
-            [
-                36224,
-                36224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json
deleted file mode 100644
index 7f4a046639..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            59
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json
deleted file mode 100644
index 2e017e0a39..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            293306
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            5,
-            1,
-            [
-                1064960,
-                1064960
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json
deleted file mode 100644
index 95c3df52a8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            293387
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            5,
-            1,
-            [
-                1064960,
-                1064960
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json
deleted file mode 100644
index 9028b81da1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            102265
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                17456,
-                17456
-            ],
-            [
-                6968,
-                6968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json
deleted file mode 100644
index 848e2d81c4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            102336
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            3,
-            8,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                17456,
-                17456
-            ],
-            [
-                6968,
-                6968
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
deleted file mode 100644
index 2b08c32c8f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            2,
-            5,
-            1,
-            [
-                16384,
-                16384
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/satellite-v9/z0/metrics.json b/metrics/next-android-render-test-runner/render-tests/satellite-v9/z0/metrics.json
deleted file mode 100644
index b3dedd944d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/satellite-v9/z0/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            8,
-            342268
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            6,
-            5,
-            1,
-            [
-                1064960,
-                1064960
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/next-android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json
deleted file mode 100644
index 04af83427d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            5,
-            5,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json
deleted file mode 100644
index 20bd7543c1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            1108
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                25584,
-                25584
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json
deleted file mode 100644
index 450fd3b15f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            1108
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json
deleted file mode 100644
index e962ac627e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            2094
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                39632,
-                39632
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json
deleted file mode 100644
index fb033edaf0..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            2094
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                133120,
-                133120
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json
deleted file mode 100644
index 20bd7543c1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            1108
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                25584,
-                25584
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json
deleted file mode 100644
index 450fd3b15f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            1108
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json
deleted file mode 100644
index e962ac627e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            2094
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                39632,
-                39632
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json
deleted file mode 100644
index fb033edaf0..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            2094
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            2,
-            5,
-            1,
-            [
-                133120,
-                133120
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json
deleted file mode 100644
index 10e4e9f2ba..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                22306,
-                22306
-            ],
-            [
-                106,
-                106
-            ],
-            [
-                1184,
-                1184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json
deleted file mode 100644
index 9deff6e405..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                22306,
-                22306
-            ],
-            [
-                190,
-                190
-            ],
-            [
-                2304,
-                2304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json
deleted file mode 100644
index 9deff6e405..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                22306,
-                22306
-            ],
-            [
-                190,
-                190
-            ],
-            [
-                2304,
-                2304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json
deleted file mode 100644
index 9deff6e405..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                22306,
-                22306
-            ],
-            [
-                190,
-                190
-            ],
-            [
-                2304,
-                2304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/point/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/point/metrics.json
deleted file mode 100644
index 10e4e9f2ba..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/point/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                22306,
-                22306
-            ],
-            [
-                106,
-                106
-            ],
-            [
-                1184,
-                1184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json
deleted file mode 100644
index 10e4e9f2ba..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                22306,
-                22306
-            ],
-            [
-                106,
-                106
-            ],
-            [
-                1184,
-                1184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json
deleted file mode 100644
index 2bdb228c52..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            183111
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            5,
-            7,
-            13,
-            1,
-            [
-                92941,
-                92941
-            ],
-            [
-                502,
-                502
-            ],
-            [
-                2464,
-                2464
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json
deleted file mode 100644
index 28402a2cc9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            792561
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            9,
-            25,
-            1,
-            [
-                98642,
-                98642
-            ],
-            [
-                40606,
-                40606
-            ],
-            [
-                187232,
-                187232
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json
deleted file mode 100644
index daaadcdba2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            601917
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            5,
-            13,
-            1,
-            [
-                41472,
-                41472
-            ],
-            [
-                48574,
-                48574
-            ],
-            [
-                647424,
-                647424
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line/metrics.json
deleted file mode 100644
index 178821e1ca..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                100352,
-                100352
-            ],
-            [
-                20710,
-                20710
-            ],
-            [
-                275904,
-                275904
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json
deleted file mode 100644
index 95aa395c60..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            475200
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            5,
-            11,
-            1,
-            [
-                52212,
-                52212
-            ],
-            [
-                296326,
-                296326
-            ],
-            [
-                1109184,
-                1109184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/point/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/point/metrics.json
deleted file mode 100644
index 178821e1ca..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/point/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                100352,
-                100352
-            ],
-            [
-                20710,
-                20710
-            ],
-            [
-                275904,
-                275904
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json
deleted file mode 100644
index 6c810abb8a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            13,
-            1,
-            [
-                53920,
-                53920
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json
deleted file mode 100644
index 7298ff45e0..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            7,
-            15,
-            1,
-            [
-                68614,
-                68614
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                640,
-                640
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
deleted file mode 100644
index c501cdfe8b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            120865
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            12,
-            7,
-            23,
-            1,
-            [
-                52430,
-                52430
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                1472,
-                1472
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json
deleted file mode 100644
index b6cfd840ae..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            7,
-            10,
-            1,
-            [
-                67534,
-                67534
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                448,
-                448
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json
deleted file mode 100644
index bfed6ec297..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            16,
-            13,
-            69,
-            1,
-            [
-                100352,
-                100352
-            ],
-            [
-                54526,
-                54526
-            ],
-            [
-                726784,
-                726784
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json
deleted file mode 100644
index bfed6ec297..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            16,
-            13,
-            69,
-            1,
-            [
-                100352,
-                100352
-            ],
-            [
-                54526,
-                54526
-            ],
-            [
-                726784,
-                726784
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json
deleted file mode 100644
index 23e6cccadb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            601917
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            5,
-            21,
-            1,
-            [
-                41472,
-                41472
-            ],
-            [
-                126910,
-                126910
-            ],
-            [
-                1691904,
-                1691904
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json
deleted file mode 100644
index bfed6ec297..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            16,
-            13,
-            69,
-            1,
-            [
-                100352,
-                100352
-            ],
-            [
-                54526,
-                54526
-            ],
-            [
-                726784,
-                726784
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json
deleted file mode 100644
index bfed6ec297..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            16,
-            13,
-            69,
-            1,
-            [
-                100352,
-                100352
-            ],
-            [
-                54526,
-                54526
-            ],
-            [
-                726784,
-                726784
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-visibility/none/metrics.json
deleted file mode 100644
index 95a181bd8c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-visibility/none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            5,
-            5,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json
deleted file mode 100644
index 1de5e049d8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1693531
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                542720,
-                542720
-            ],
-            [
-                19414,
-                19414
-            ],
-            [
-                258624,
-                258624
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/default/metrics.json
deleted file mode 100644
index b5449900fc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                29696,
-                29696
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json
deleted file mode 100644
index b5449900fc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                29696,
-                29696
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json
deleted file mode 100644
index 2acbad453c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                35100,
-                35100
-            ],
-            [
-                346,
-                346
-            ],
-            [
-                4384,
-                4384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json
deleted file mode 100644
index b5449900fc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            211659
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                29696,
-                29696
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json
deleted file mode 100644
index 2acbad453c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                35100,
-                35100
-            ],
-            [
-                346,
-                346
-            ],
-            [
-                4384,
-                4384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json
deleted file mode 100644
index 7cdd3a4812..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                85168,
-                85168
-            ],
-            [
-                35278,
-                35278
-            ],
-            [
-                470144,
-                470144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json
deleted file mode 100644
index 7cdd3a4812..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                85168,
-                85168
-            ],
-            [
-                35278,
-                35278
-            ],
-            [
-                470144,
-                470144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom/metrics.json
deleted file mode 100644
index 7cdd3a4812..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                85168,
-                85168
-            ],
-            [
-                35278,
-                35278
-            ],
-            [
-                470144,
-                470144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/center/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/center/metrics.json
deleted file mode 100644
index 7cdd3a4812..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/center/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                85168,
-                85168
-            ],
-            [
-                35278,
-                35278
-            ],
-            [
-                470144,
-                470144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/left/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/left/metrics.json
deleted file mode 100644
index 7cdd3a4812..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/left/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                85168,
-                85168
-            ],
-            [
-                35278,
-                35278
-            ],
-            [
-                470144,
-                470144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/property-function/metrics.json
deleted file mode 100644
index 6d769f5648..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33209,
-                33209
-            ],
-            [
-                130,
-                130
-            ],
-            [
-                1504,
-                1504
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/right/metrics.json
deleted file mode 100644
index 7cdd3a4812..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/right/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                85168,
-                85168
-            ],
-            [
-                35278,
-                35278
-            ],
-            [
-                470144,
-                470144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/top-left/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/top-left/metrics.json
deleted file mode 100644
index 7cdd3a4812..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/top-left/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                85168,
-                85168
-            ],
-            [
-                35278,
-                35278
-            ],
-            [
-                470144,
-                470144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/top-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/top-right/metrics.json
deleted file mode 100644
index 7cdd3a4812..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/top-right/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                85168,
-                85168
-            ],
-            [
-                35278,
-                35278
-            ],
-            [
-                470144,
-                470144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/top/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/top/metrics.json
deleted file mode 100644
index 7cdd3a4812..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/top/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                85168,
-                85168
-            ],
-            [
-                35278,
-                35278
-            ],
-            [
-                470144,
-                470144
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json
deleted file mode 100644
index 932066a29f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            254666
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                46848,
-                46848
-            ],
-            [
-                454,
-                454
-            ],
-            [
-                5824,
-                5824
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json
deleted file mode 100644
index ed9a135831..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            332181
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                48392,
-                48392
-            ],
-            [
-                466,
-                466
-            ],
-            [
-                5984,
-                5984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break/metrics.json
deleted file mode 100644
index 8ebd514b42..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            254666
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                42293,
-                42293
-            ],
-            [
-                274,
-                274
-            ],
-            [
-                3424,
-                3424
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json
deleted file mode 100644
index a2ea9c5fb7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            159421
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                37304,
-                37304
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                864,
-                864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json
deleted file mode 100644
index 987740be5e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            332181
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                71273,
-                71273
-            ],
-            [
-                670,
-                670
-            ],
-            [
-                8704,
-                8704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-color/default/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-color/function/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-color/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-color/literal/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-color/property-function/metrics.json
deleted file mode 100644
index 60c3ad345f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-color/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            10,
-            1,
-            [
-                35828,
-                35828
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                1600,
-                1600
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json
deleted file mode 100644
index 526f4071d8..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            235100
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                38852,
-                38852
-            ],
-            [
-                454,
-                454
-            ],
-            [
-                5824,
-                5824
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json
deleted file mode 100644
index 62c000b290..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            161976
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                24580,
-                24580
-            ],
-            [
-                190,
-                190
-            ],
-            [
-                2304,
-                2304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json
deleted file mode 100644
index a02d067247..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            120865
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            11,
-            1,
-            [
-                28318,
-                28318
-            ],
-            [
-                190,
-                190
-            ],
-            [
-                1744,
-                1744
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json
deleted file mode 100644
index 137e66bf14..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            120865
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            6,
-            13,
-            1,
-            [
-                44921,
-                44921
-            ],
-            [
-                310,
-                310
-            ],
-            [
-                3904,
-                3904
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
deleted file mode 100644
index a56a73a714..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            161976
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                24580,
-                24580
-            ],
-            [
-                2290,
-                2290
-            ],
-            [
-                30304,
-                30304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json
deleted file mode 100644
index 197cdb9b50..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            255564
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35756,
-                35756
-            ],
-            [
-                310,
-                310
-            ],
-            [
-                3904,
-                3904
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
deleted file mode 100644
index 4b81074408..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            161976
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            13,
-            13,
-            1,
-            [
-                98636,
-                98636
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                1664,
-                1664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images/metrics.json
deleted file mode 100644
index 52b1978f29..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            161976
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            17,
-            1,
-            [
-                52510,
-                52510
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                1984,
-                1984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-line/metrics.json
deleted file mode 100644
index 089da63a88..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            1641559
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                307906,
-                307906
-            ],
-            [
-                16138,
-                16138
-            ],
-            [
-                214944,
-                214944
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
deleted file mode 100644
index 128115bae7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            15,
-            1,
-            [
-                42326,
-                42326
-            ],
-            [
-                286,
-                286
-            ],
-            [
-                4288,
-                4288
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json
deleted file mode 100644
index 0f1b65a6db..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            10,
-            1,
-            [
-                39977,
-                39977
-            ],
-            [
-                190,
-                190
-            ],
-            [
-                2752,
-                2752
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json
deleted file mode 100644
index 1640b2b40b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            159687
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            10,
-            1,
-            [
-                45064,
-                45064
-            ],
-            [
-                298,
-                298
-            ],
-            [
-                4480,
-                4480
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted/metrics.json
deleted file mode 100644
index 883429ed73..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            159687
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                45064,
-                45064
-            ],
-            [
-                226,
-                226
-            ],
-            [
-                2784,
-                2784
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/literal/metrics.json
deleted file mode 100644
index 0206fc826f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35828,
-                35828
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/property-function/metrics.json
deleted file mode 100644
index f20b89d82f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35968,
-                35968
-            ],
-            [
-                106,
-                106
-            ],
-            [
-                1184,
-                1184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/token/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/token/metrics.json
deleted file mode 100644
index fa46462cc5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-field/token/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                36568,
-                36568
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                1664,
-                1664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-font/camera-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-font/camera-function/metrics.json
deleted file mode 100644
index 0206fc826f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-font/camera-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35828,
-                35828
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-font/chinese/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-font/chinese/metrics.json
deleted file mode 100644
index 46fdec9d05..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-font/chinese/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            83,
-            16423893
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            13,
-            9,
-            1,
-            [
-                3740996,
-                3740996
-            ],
-            [
-                30022,
-                30022
-            ],
-            [
-                400064,
-                400064
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-font/data-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-font/data-expression/metrics.json
deleted file mode 100644
index aac1bbcfbc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-font/data-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            159687
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33992,
-                33992
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-font/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-font/literal/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-font/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/default/metrics.json
deleted file mode 100644
index 860834fedb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/function/metrics.json
deleted file mode 100644
index 860834fedb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json
deleted file mode 100644
index 860834fedb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json
deleted file mode 100644
index 37f4af4128..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            10,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                1120,
-                1120
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-color/default/metrics.json
deleted file mode 100644
index bf6832d42b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-color/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-color/function/metrics.json
deleted file mode 100644
index 860834fedb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-color/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-color/literal/metrics.json
deleted file mode 100644
index 860834fedb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-color/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json
deleted file mode 100644
index 47cea62594..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            10,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                1216,
-                1216
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-width/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-width/default/metrics.json
deleted file mode 100644
index bf6832d42b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-width/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-width/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-width/function/metrics.json
deleted file mode 100644
index 860834fedb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-width/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-width/literal/metrics.json
deleted file mode 100644
index 860834fedb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-width/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json
deleted file mode 100644
index 37f4af4128..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            10,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                1120,
-                1120
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-justify/auto/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-justify/auto/metrics.json
deleted file mode 100644
index 0f7801b2e4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-justify/auto/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                153536,
-                153536
-            ],
-            [
-                1426,
-                1426
-            ],
-            [
-                18784,
-                18784
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-justify/left/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-justify/left/metrics.json
deleted file mode 100644
index 41ff7515c7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-justify/left/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                32566,
-                32566
-            ],
-            [
-                433984,
-                433984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-justify/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-justify/property-function/metrics.json
deleted file mode 100644
index 5c1e774f37..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-justify/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                39410,
-                39410
-            ],
-            [
-                814,
-                814
-            ],
-            [
-                10624,
-                10624
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-justify/right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-justify/right/metrics.json
deleted file mode 100644
index 41ff7515c7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-justify/right/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                32566,
-                32566
-            ],
-            [
-                433984,
-                433984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json
deleted file mode 100644
index 8a117769b2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                190318,
-                190318
-            ],
-            [
-                6982,
-                6982
-            ],
-            [
-                92864,
-                92864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
deleted file mode 100644
index 1a478f9857..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            11,
-            1,
-            [
-                33392,
-                33392
-            ],
-            [
-                262,
-                262
-            ],
-            [
-                2272,
-                2272
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
deleted file mode 100644
index 8a117769b2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                190318,
-                190318
-            ],
-            [
-                6982,
-                6982
-            ],
-            [
-                92864,
-                92864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
deleted file mode 100644
index 8a117769b2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                190318,
-                190318
-            ],
-            [
-                6982,
-                6982
-            ],
-            [
-                92864,
-                92864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
deleted file mode 100644
index 2412b1cc57..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            4,
-            23,
-            1,
-            [
-                33392,
-                33392
-            ],
-            [
-                154,
-                154
-            ],
-            [
-                1408,
-                1408
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json
deleted file mode 100644
index 8a117769b2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                190318,
-                190318
-            ],
-            [
-                6982,
-                6982
-            ],
-            [
-                92864,
-                92864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
deleted file mode 100644
index 68d8b35e75..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                142736,
-                142736
-            ],
-            [
-                347242,
-                347242
-            ],
-            [
-                4629664,
-                4629664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
deleted file mode 100644
index 68d8b35e75..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                142736,
-                142736
-            ],
-            [
-                347242,
-                347242
-            ],
-            [
-                4629664,
-                4629664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
deleted file mode 100644
index 68d8b35e75..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                142736,
-                142736
-            ],
-            [
-                347242,
-                347242
-            ],
-            [
-                4629664,
-                4629664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
deleted file mode 100644
index 68d8b35e75..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                142736,
-                142736
-            ],
-            [
-                347242,
-                347242
-            ],
-            [
-                4629664,
-                4629664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json
deleted file mode 100644
index 97d7f27021..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                40237,
-                40237
-            ],
-            [
-                550,
-                550
-            ],
-            [
-                7104,
-                7104
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
deleted file mode 100644
index fd1ea83213..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            7,
-            13,
-            1,
-            [
-                84940,
-                84940
-            ],
-            [
-                838,
-                838
-            ],
-            [
-                10944,
-                10944
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-line-height/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-line-height/literal/metrics.json
deleted file mode 100644
index 41ff7515c7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-line-height/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                32566,
-                32566
-            ],
-            [
-                433984,
-                433984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json
deleted file mode 100644
index 9551aabb14..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                190318,
-                190318
-            ],
-            [
-                14662,
-                14662
-            ],
-            [
-                195264,
-                195264
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-angle/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-angle/literal/metrics.json
deleted file mode 100644
index 2ad59dd984..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-max-angle/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                190318,
-                190318
-            ],
-            [
-                7414,
-                7414
-            ],
-            [
-                98624,
-                98624
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json
deleted file mode 100644
index b553d8692d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35777,
-                35777
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                1664,
-                1664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json
deleted file mode 100644
index b553d8692d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35777,
-                35777
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                1664,
-                1664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json
deleted file mode 100644
index 4c0301c08d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            10,
-            1885732
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                56400,
-                56400
-            ],
-            [
-                1354,
-                1354
-            ],
-            [
-                17824,
-                17824
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
deleted file mode 100644
index e6477234cc..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            16,
-            2789819
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                82013,
-                82013
-            ],
-            [
-                1462,
-                1462
-            ],
-            [
-                19264,
-                19264
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/literal/metrics.json
deleted file mode 100644
index 05279818ae..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                46574,
-                46574
-            ],
-            [
-                526,
-                526
-            ],
-            [
-                6784,
-                6784
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/property-function/metrics.json
deleted file mode 100644
index 8eef9a4166..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                44960,
-                44960
-            ],
-            [
-                646,
-                646
-            ],
-            [
-                8384,
-                8384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json
deleted file mode 100644
index b95ec5af3c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            13,
-            13,
-            1,
-            [
-                156936,
-                156936
-            ],
-            [
-                1198,
-                1198
-            ],
-            [
-                15744,
-                15744
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json
deleted file mode 100644
index 563004e912..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            8,
-            29,
-            1,
-            [
-                101743,
-                101743
-            ],
-            [
-                2470,
-                2470
-            ],
-            [
-                32704,
-                32704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
deleted file mode 100644
index 6ad395e0b5..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                96248,
-                96248
-            ],
-            [
-                37990,
-                37990
-            ],
-            [
-                506304,
-                506304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/property-function/metrics.json
deleted file mode 100644
index 384ce4dadb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                19074,
-                19074
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                1984,
-                1984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-opacity/default/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-opacity/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-opacity/function/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-opacity/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-opacity/literal/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-opacity/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-opacity/property-function/metrics.json
deleted file mode 100644
index 6734d0b046..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-opacity/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            10,
-            1,
-            [
-                35828,
-                35828
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                1472,
-                1472
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
deleted file mode 100644
index 1514cee615..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            475200
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            11,
-            1,
-            [
-                97834,
-                97834
-            ],
-            [
-                59962,
-                59962
-            ],
-            [
-                491664,
-                491664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
deleted file mode 100644
index 1514cee615..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            475200
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            11,
-            1,
-            [
-                97834,
-                97834
-            ],
-            [
-                59962,
-                59962
-            ],
-            [
-                491664,
-                491664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
deleted file mode 100644
index 2292400be6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            18,
-            10,
-            35,
-            1,
-            [
-                113046,
-                113046
-            ],
-            [
-                958,
-                958
-            ],
-            [
-                5224,
-                5224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
deleted file mode 100644
index 1514cee615..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            475200
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            11,
-            1,
-            [
-                97834,
-                97834
-            ],
-            [
-                59962,
-                59962
-            ],
-            [
-                491664,
-                491664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
deleted file mode 100644
index 1514cee615..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            475200
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            11,
-            1,
-            [
-                97834,
-                97834
-            ],
-            [
-                59962,
-                59962
-            ],
-            [
-                491664,
-                491664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
deleted file mode 100644
index d05556cd14..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            92076
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            9,
-            1,
-            [
-                33362,
-                33362
-            ],
-            [
-                2506,
-                2506
-            ],
-            [
-                33184,
-                33184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
deleted file mode 100644
index edd93c6655..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            16,
-            17,
-            1,
-            [
-                222590,
-                222590
-            ],
-            [
-                8734,
-                8734
-            ],
-            [
-                116224,
-                116224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
deleted file mode 100644
index 2292400be6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            18,
-            10,
-            35,
-            1,
-            [
-                113046,
-                113046
-            ],
-            [
-                958,
-                958
-            ],
-            [
-                5224,
-                5224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
deleted file mode 100644
index 1514cee615..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            475200
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            11,
-            1,
-            [
-                97834,
-                97834
-            ],
-            [
-                59962,
-                59962
-            ],
-            [
-                491664,
-                491664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
deleted file mode 100644
index 1514cee615..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            475200
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            11,
-            1,
-            [
-                97834,
-                97834
-            ],
-            [
-                59962,
-                59962
-            ],
-            [
-                491664,
-                491664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json
deleted file mode 100644
index 1514cee615..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            475200
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            7,
-            11,
-            1,
-            [
-                97834,
-                97834
-            ],
-            [
-                59962,
-                59962
-            ],
-            [
-                491664,
-                491664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json
deleted file mode 100644
index dfa7520916..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                33209,
-                33209
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                1648,
-                1648
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json
deleted file mode 100644
index 789eb531ac..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                21292,
-                21292
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                864,
-                864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json
deleted file mode 100644
index 789eb531ac..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                21292,
-                21292
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                864,
-                864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json
deleted file mode 100644
index 789eb531ac..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                21292,
-                21292
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                864,
-                864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json
deleted file mode 100644
index 789eb531ac..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                21292,
-                21292
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                864,
-                864
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/function/metrics.json
deleted file mode 100644
index 0206fc826f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35828,
-                35828
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/literal/metrics.json
deleted file mode 100644
index 0206fc826f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35828,
-                35828
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/property-function/metrics.json
deleted file mode 100644
index 0859331916..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33340,
-                33340
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json
deleted file mode 100644
index ca4687f419..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            12,
-            1,
-            [
-                35828,
-                35828
-            ],
-            [
-                86,
-                86
-            ],
-            [
-                800,
-                800
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
deleted file mode 100644
index 70ac3608a9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33408,
-                33408
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                1984,
-                1984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
deleted file mode 100644
index 905846132d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33408,
-                33408
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
deleted file mode 100644
index 70ac3608a9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33408,
-                33408
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                1984,
-                1984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
deleted file mode 100644
index 905846132d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33408,
-                33408
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
deleted file mode 100644
index 70ac3608a9..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33408,
-                33408
-            ],
-            [
-                166,
-                166
-            ],
-            [
-                1984,
-                1984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
deleted file mode 100644
index 905846132d..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33408,
-                33408
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json
deleted file mode 100644
index 84fc4fe605..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33392,
-                33392
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json
deleted file mode 100644
index bf6832d42b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/composite-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/composite-expression/metrics.json
deleted file mode 100644
index be4621cd93..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-size/composite-expression/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                33392,
-                33392
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                704,
-                704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json
deleted file mode 100644
index 5c85a420f3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                48536,
-                48536
-            ],
-            [
-                334,
-                334
-            ],
-            [
-                4224,
-                4224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/composite-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/composite-function/metrics.json
deleted file mode 100644
index 84fc4fe605..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-size/composite-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33392,
-                33392
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/default/metrics.json
deleted file mode 100644
index bf6832d42b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-size/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/function/metrics.json
deleted file mode 100644
index bf6832d42b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-size/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/literal/metrics.json
deleted file mode 100644
index bf6832d42b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-size/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                35153,
-                35153
-            ],
-            [
-                58,
-                58
-            ],
-            [
-                544,
-                544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/property-function/metrics.json
deleted file mode 100644
index 84fc4fe605..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-size/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                33392,
-                33392
-            ],
-            [
-                46,
-                46
-            ],
-            [
-                384,
-                384
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json
deleted file mode 100644
index 05d7f57555..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            636073
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                21292,
-                21292
-            ],
-            [
-                10162,
-                10162
-            ],
-            [
-                135264,
-                135264
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-transform/lowercase/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-transform/lowercase/metrics.json
deleted file mode 100644
index 2bf7d11354..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-transform/lowercase/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                138368,
-                138368
-            ],
-            [
-                32566,
-                32566
-            ],
-            [
-                433984,
-                433984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-transform/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-transform/property-function/metrics.json
deleted file mode 100644
index 94f6c3ccd6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-transform/property-function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                37008,
-                37008
-            ],
-            [
-                142,
-                142
-            ],
-            [
-                1664,
-                1664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-transform/uppercase/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-transform/uppercase/metrics.json
deleted file mode 100644
index ecb7316699..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-transform/uppercase/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                139552,
-                139552
-            ],
-            [
-                32566,
-                32566
-            ],
-            [
-                433984,
-                433984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json
deleted file mode 100644
index 9162d111f6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            792561
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            7,
-            13,
-            1,
-            [
-                71656,
-                71656
-            ],
-            [
-                5398,
-                5398
-            ],
-            [
-                71744,
-                71744
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json
deleted file mode 100644
index 9162d111f6..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            792561
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            7,
-            13,
-            1,
-            [
-                71656,
-                71656
-            ],
-            [
-                5398,
-                5398
-            ],
-            [
-                71744,
-                71744
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-translate/default/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-translate/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-translate/function/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-translate/function/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-translate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-translate/literal/metrics.json
deleted file mode 100644
index cd668f351a..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-translate/literal/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
deleted file mode 100644
index 9953c2ea9e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            13,
-            37,
-            1,
-            [
-                90448,
-                90448
-            ],
-            [
-                100366,
-                100366
-            ],
-            [
-                1337984,
-                1337984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
deleted file mode 100644
index dfa7520916..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                33209,
-                33209
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                1648,
-                1648
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
deleted file mode 100644
index dfa7520916..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                33209,
-                33209
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                1648,
-                1648
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
deleted file mode 100644
index dfa7520916..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                33209,
-                33209
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                1648,
-                1648
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
deleted file mode 100644
index dca033517b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            686859
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            5,
-            9,
-            1,
-            [
-                52212,
-                52212
-            ],
-            [
-                5494,
-                5494
-            ],
-            [
-                73024,
-                73024
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
deleted file mode 100644
index a7cc632922..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            13,
-            2413450
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            16,
-            36,
-            4,
-            [
-                143312,
-                143312
-            ],
-            [
-                194056,
-                194056
-            ],
-            [
-                2586496,
-                2586496
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
deleted file mode 100644
index dfa7520916..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                33209,
-                33209
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                1648,
-                1648
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
deleted file mode 100644
index dfa7520916..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                33209,
-                33209
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                1648,
-                1648
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
deleted file mode 100644
index dfa7520916..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                33209,
-                33209
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                1648,
-                1648
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json
deleted file mode 100644
index 806d886e75..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                97654,
-                97654
-            ],
-            [
-                1301824,
-                1301824
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
deleted file mode 100644
index 031fe71047..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                28467,
-                28467
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                2944,
-                2944
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json
deleted file mode 100644
index 031fe71047..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                28467,
-                28467
-            ],
-            [
-                238,
-                238
-            ],
-            [
-                2944,
-                2944
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
deleted file mode 100644
index 3a2c346277..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            296601
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            4,
-            19,
-            1,
-            [
-                32035,
-                32035
-            ],
-            [
-                422,
-                422
-            ],
-            [
-                4928,
-                4928
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
deleted file mode 100644
index c4efa5911f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            12,
-            27,
-            1,
-            [
-                150144,
-                150144
-            ],
-            [
-                406,
-                406
-            ],
-            [
-                3744,
-                3744
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json
deleted file mode 100644
index b06ed0feb2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            11,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            21,
-            21,
-            1,
-            [
-                274384,
-                274384
-            ],
-            [
-                97654,
-                97654
-            ],
-            [
-                1301824,
-                1301824
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
deleted file mode 100644
index 415dfc131f..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            8,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            8,
-            15,
-            33,
-            1,
-            [
-                176080,
-                176080
-            ],
-            [
-                101270,
-                101270
-            ],
-            [
-                1323520,
-                1323520
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json
deleted file mode 100644
index b06ed0feb2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            11,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            21,
-            21,
-            1,
-            [
-                274384,
-                274384
-            ],
-            [
-                97654,
-                97654
-            ],
-            [
-                1301824,
-                1301824
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json
deleted file mode 100644
index b06ed0feb2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            11,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            21,
-            21,
-            1,
-            [
-                274384,
-                274384
-            ],
-            [
-                97654,
-                97654
-            ],
-            [
-                1301824,
-                1301824
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json
deleted file mode 100644
index 33eed36df4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1004220
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            7,
-            13,
-            1,
-            [
-                71656,
-                71656
-            ],
-            [
-                48406,
-                48406
-            ],
-            [
-                645184,
-                645184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json
deleted file mode 100644
index 33eed36df4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1004220
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            7,
-            13,
-            1,
-            [
-                71656,
-                71656
-            ],
-            [
-                48406,
-                48406
-            ],
-            [
-                645184,
-                645184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json
deleted file mode 100644
index 33eed36df4..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1004220
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            7,
-            13,
-            1,
-            [
-                71656,
-                71656
-            ],
-            [
-                48406,
-                48406
-            ],
-            [
-                645184,
-                645184
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json
deleted file mode 100644
index 9dca847cbb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                32566,
-                32566
-            ],
-            [
-                433984,
-                433984
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json
deleted file mode 100644
index a8acd89723..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1778473
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                10870,
-                10870
-            ],
-            [
-                144704,
-                144704
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
deleted file mode 100644
index 40b67f1445..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            11,
-            1,
-            [
-                33209,
-                33209
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                768,
-                768
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
deleted file mode 100644
index 74f5df99b3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            7,
-            1198157
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            7,
-            17,
-            1,
-            [
-                171106,
-                171106
-            ],
-            [
-                22450,
-                22450
-            ],
-            [
-                264688,
-                264688
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-visibility/none/metrics.json
deleted file mode 100644
index 7da0796966..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-visibility/none/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            5,
-            5,
-            1,
-            [
-                65536,
-                65536
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-visibility/visible/metrics.json
deleted file mode 100644
index d7ff42c127..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-visibility/visible/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            5,
-            1566814
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                143312,
-                143312
-            ],
-            [
-                92614,
-                92614
-            ],
-            [
-                1234624,
-                1234624
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
deleted file mode 100644
index 4da17ca35c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            12,
-            1726951
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            4,
-            11,
-            1,
-            [
-                51945,
-                51945
-            ],
-            [
-                2158,
-                2158
-            ],
-            [
-                26752,
-                26752
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json
deleted file mode 100644
index 4c978ab6c2..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            42,
-            8167579
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            11,
-            13,
-            25,
-            1,
-            [
-                305640,
-                305640
-            ],
-            [
-                3526,
-                3526
-            ],
-            [
-                44480,
-                44480
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json
deleted file mode 100644
index 8c2cc0dbcb..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            74745
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            11,
-            13,
-            25,
-            1,
-            [
-                146720,
-                146720
-            ],
-            [
-                1870,
-                1870
-            ],
-            [
-                22400,
-                22400
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json
deleted file mode 100644
index caf18baec7..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            673020
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            11,
-            13,
-            25,
-            1,
-            [
-                171956,
-                171956
-            ],
-            [
-                3334,
-                3334
-            ],
-            [
-                41920,
-                41920
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
deleted file mode 100644
index 23e8621fe3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            3,
-            295054
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                45608,
-                45608
-            ],
-            [
-                1342,
-                1342
-            ],
-            [
-                17664,
-                17664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
deleted file mode 100644
index 7d4c49afdf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            134699
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                41706,
-                41706
-            ],
-            [
-                526,
-                526
-            ],
-            [
-                6784,
-                6784
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
deleted file mode 100644
index eabb4022be..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            219641
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                41706,
-                41706
-            ],
-            [
-                550,
-                550
-            ],
-            [
-                7104,
-                7104
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
deleted file mode 100644
index 25fb8b4d1e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            12,
-            1726951
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                54188,
-                54188
-            ],
-            [
-                790,
-                790
-            ],
-            [
-                10304,
-                10304
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
deleted file mode 100644
index d8ccbe177b..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            431300
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                31984,
-                31984
-            ],
-            [
-                1030,
-                1030
-            ],
-            [
-                13504,
-                13504
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
deleted file mode 100644
index 632a29ad17..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            134699
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                41706,
-                41706
-            ],
-            [
-                598,
-                598
-            ],
-            [
-                7744,
-                7744
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
deleted file mode 100644
index 7d4c49afdf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            134699
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                41706,
-                41706
-            ],
-            [
-                526,
-                526
-            ],
-            [
-                6784,
-                6784
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
deleted file mode 100644
index 7d4c49afdf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            134699
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                41706,
-                41706
-            ],
-            [
-                526,
-                526
-            ],
-            [
-                6784,
-                6784
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
deleted file mode 100644
index 7d4c49afdf..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            134699
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                41706,
-                41706
-            ],
-            [
-                526,
-                526
-            ],
-            [
-                6784,
-                6784
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
deleted file mode 100644
index 5cf22c6b3e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            84942
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                36386,
-                36386
-            ],
-            [
-                94,
-                94
-            ],
-            [
-                1024,
-                1024
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
deleted file mode 100644
index ad6e567fda..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            431300
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            13,
-            1,
-            [
-                37192,
-                37192
-            ],
-            [
-                958,
-                958
-            ],
-            [
-                12544,
-                12544
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
deleted file mode 100644
index c1486937e1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            2,
-            219641
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            4,
-            9,
-            1,
-            [
-                50408,
-                50408
-            ],
-            [
-                910,
-                910
-            ],
-            [
-                11904,
-                11904
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json
deleted file mode 100644
index 9ff0b2697c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            7,
-            1,
-            [
-                49152,
-                49152
-            ],
-            [
-                25594,
-                25594
-            ],
-            [
-                45664,
-                45664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json b/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
deleted file mode 100644
index 9ff0b2697c..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            2,
-            4,
-            7,
-            1,
-            [
-                49152,
-                49152
-            ],
-            [
-                25594,
-                25594
-            ],
-            [
-                45664,
-                45664
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/tms/tms/metrics.json b/metrics/next-android-render-test-runner/render-tests/tms/tms/metrics.json
deleted file mode 100644
index f7ca11c232..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/tms/tms/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            367855
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            12,
-            9,
-            17,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                24058,
-                24058
-            ],
-            [
-                10024,
-                10024
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-history/in/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-history/in/metrics.json
deleted file mode 100644
index ba820d16da..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoom-history/in/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            9,
-            15,
-            1,
-            [
-                98816,
-                98816
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-history/out/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-history/out/metrics.json
deleted file mode 100644
index ba820d16da..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoom-history/out/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            9,
-            15,
-            1,
-            [
-                98816,
-                98816
-            ],
-            [
-                82,
-                82
-            ],
-            [
-                224,
-                224
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/above/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/above/metrics.json
deleted file mode 100644
index 8fbd5d92e3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/above/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/below/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/below/metrics.json
deleted file mode 100644
index d11ea20c71..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/below/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json
deleted file mode 100644
index ed48714735..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            13,
-            21,
-            1,
-            [
-                196608,
-                196608
-            ],
-            [
-                118,
-                118
-            ],
-            [
-                192,
-                192
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json
deleted file mode 100644
index 8fbd5d92e3..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json
deleted file mode 100644
index b51667187e..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            9,
-            13,
-            1,
-            [
-                131072,
-                131072
-            ],
-            [
-                70,
-                70
-            ],
-            [
-                128,
-                128
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json
deleted file mode 100644
index 01b432fe21..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            1,
-            3,
-            7,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                34,
-                34
-            ],
-            [
-                80,
-                80
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoomed-fill/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoomed-fill/default/metrics.json
deleted file mode 100644
index ca6ff8e333..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoomed-fill/default/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            1,
-            390258
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            3,
-            6,
-            8,
-            1,
-            [
-                81920,
-                81920
-            ],
-            [
-                70598,
-                70598
-            ],
-            [
-                37328,
-                37328
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json
deleted file mode 100644
index 4859f4afb1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            6,
-            290116
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            6,
-            11,
-            5,
-            1,
-            [
-                1638400,
-                1638400
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json
deleted file mode 100644
index 10305579d1..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            4,
-            192641
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            4,
-            7,
-            5,
-            1,
-            [
-                1081344,
-                1081344
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json
deleted file mode 100644
index 50f1262c46..0000000000
--- a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "network": [
-        [
-            "probeNetwork - default - end",
-            0,
-            0
-        ],
-        [
-            "probeNetwork - default - start",
-            0,
-            0
-        ]
-    ],
-    "gfx": [
-        [
-            "probeGFX - default - end",
-            0,
-            3,
-            5,
-            1,
-            [
-                32768,
-                32768
-            ],
-            [
-                22,
-                22
-            ],
-            [
-                64,
-                64
-            ]
-        ]
-    ]
-}
\ No newline at end of file