diff --git a/config/generated/ci_yaml/engine_config.json b/config/generated/ci_yaml/engine_config.json
index 2509543..0369ae6 100644
--- a/config/generated/ci_yaml/engine_config.json
+++ b/config/generated/ci_yaml/engine_config.json
@@ -1 +1 @@
-{"targets":[{"name":"Linux linux_android_emulator_tests","timeout":60,"properties":{"config_name":"linux_android_emulator","dependencies":"[\n  {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"runIf":[".ci.yaml","ci/builders/linux_android_emulator.json","DEPS","lib/ui/**","shell/platform/android/**","testing/scenario_app/**"],"enabledBranches":["main"],"recipe":"engine_v2/engine_v2"},{"name":"Linux linux_android_emulator_tests_api_33","bringup":true,"timeout":60,"properties":{"config_name":"linux_android_emulator_api_33","dependencies":"[\n  {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"runIf":[".ci.yaml","ci/builders/linux_android_emulator_api_33.json","DEPS","lib/ui/**","shell/platform/android/**","testing/scenario_app/**"],"enabledBranches":["main"],"recipe":"engine_v2/engine_v2"},{"name":"Linux builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n  \"builder\",\n  \"git\"\n]","gclient_variables":"{\n  \"download_emsdk\": \"true\",\n  \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Windows builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n  \"builder\",\n  \"git\"\n]","gclient_variables":"{\n  \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Mac builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n  \"builder\",\n  \"git\"\n]","ignore_cache_paths":"[\n  \"builder/src/flutter/prebuilts/SDKs\",\n  \"builder/src/flutter/prebuilts/Library\"\n]","gclient_variables":"{\n  \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Linux linux_benchmarks","timeout":60,"properties":{"config_name":"linux_benchmarks"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/builder"},{"name":"Linux linux_fuchsia","timeout":60,"properties":{"release_build":"true","config_name":"linux_fuchsia"},"recipe":"engine_v2/engine_v2","dimensions":{"kvm":"1"},"droneDimensions":["os=Linux"]},{"name":"Linux Framework Smoke Tests","timeout":60,"properties":{"gclient_variables":"{\"use_rbe\": true}"},"enabledBranches":["main"],"recipe":"engine/framework_smoke"},{"name":"Linux linux_clang_tidy","timeout":120,"properties":{"config_name":"linux_clang_tidy"},"runIf":["DEPS",".ci.yaml","tools/clang_tidy/**","ci/builders/**","ci/clang_tidy.sh","**.h","**.c","**.cc","**.fbs","**.frag","**.vert"],"recipe":"engine_v2/engine_v2"},{"name":"Linux linux_arm_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_arm_host_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_host_engine","dependencies":"[\n  {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_host_desktop_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_host_desktop_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_android_aot_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_android_debug_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_android_debug_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_license","timeout":120,"properties":{"add_recipes_cq":"true","config_name":"linux_license","clobber":"true"},"recipe":"engine_v2/builder"},{"name":"Linux linux_web_engine","timeout":120,"properties":{"release_build":"true","config_name":"linux_web_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_unopt","timeout":120,"properties":{"config_name":"linux_unopt"},"recipe":"engine_v2/engine_v2"},{"name":"Linux Web Framework tests","timeout":60,"properties":{"add_recipes_cq":"true","cores":"32","gclient_variables":"{\"download_emsdk\": true}","dependencies":"[\n  {\"dependency\": \"chrome_and_driver\", \"version\": \"version:119.0.6045.9\"},\n  {\"dependency\": \"curl\", \"version\": \"version:7.64.0\"}\n]","framework":"true","no_goma":"true","drone_dimensions":"[\"device_type=none\", \"os=Linux\"]\n","shard":"web_tests","subshards":"[\"0\", \"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7_last\"]"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"enabledBranches":["main"],"recipe":"engine/web_engine_framework"},{"name":"Linux mac_android_aot_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"mac_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Mac mac_clang_tidy","timeout":120,"properties":{"config_name":"mac_clang_tidy"},"runIf":["DEPS",".ci.yaml","tools/clang_tidy/**","ci/builders/**","ci/clang_tidy.sh","**.h","**.c","**.cc","**.fbs","**.frag","**.vert","**.m","**.mm"],"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_host_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","cpu":"arm64","config_name":"mac_host_engine","dependencies":"[\n  {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]","$flutter/osx_sdk":"{\n  \"sdk_version\": \"15a240d\"\n}"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Mac-13"]},{"name":"Linux mac_unopt","timeout":120,"properties":{"config_name":"mac_unopt","add_recipes_cq":"true"},"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_ios_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"mac_ios_engine","$flutter/osx_sdk":"{\n  \"sdk_version\": \"15a240d\"\n}"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Mac-13","cpu=x86"]},{"name":"Mac impeller-cmake-example","bringup":true,"timeout":60,"properties":{"cpu":"arm64","config_name":"mac_impeller_cmake_example"},"recipe":"engine_v2/engine_v2"},{"name":"Windows windows_android_aot_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"windows_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"windows_host_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_arm_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","config_name":"windows_arm_host_engine"},"enabledBranches":["main"],"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_unopt","timeout":120,"properties":{"config_name":"windows_unopt"},"recipe":"engine_v2/builder"},{"name":"Linux ci_yaml engine roller","bringup":true,"properties":{"backfill":"false"},"recipe":"infra/ci_yaml"}],"enabledBranches":["main","flutter-\\d+\\.\\d+-candidate\\.\\d+","fuchsia_r\\d+[a-z]*"],"platformProperties":{"linux":{"properties":{"dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:17\"},\n  {\"dependency\": \"gradle_cache\", \"version\": \"none\"}\n]","device_type":"none","os":"Ubuntu","cores":"8"}},"mac":{"properties":{"dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:17\"}\n]","device_type":"none","os":"Mac-13","$flutter/osx_sdk":"{\n  \"sdk_version\": \"15a240d\"\n}"}},"windows":{"properties":{"dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:17\"}\n]","device_type":"none","os":"Windows-10"}}}}
+{"targets":[{"name":"Linux linux_android_emulator_tests","timeout":60,"properties":{"config_name":"linux_android_emulator","dependencies":"[\n  {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"runIf":[".ci.yaml","ci/builders/linux_android_emulator.json","DEPS","lib/ui/**","shell/platform/android/**","testing/scenario_app/**"],"enabledBranches":["main"],"recipe":"engine_v2/engine_v2"},{"name":"Linux linux_android_emulator_opengles_tests","bringup":true,"timeout":60,"properties":{"config_name":"linux_android_emulator_opengles","dependencies":"[\n  {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"runIf":[".ci.yaml","ci/builders/linux_android_emulator.json","DEPS","lib/ui/**","shell/platform/android/**","testing/scenario_app/**"],"enabledBranches":["main"],"recipe":"engine_v2/engine_v2"},{"name":"Linux linux_android_emulator_tests_api_33","bringup":true,"timeout":60,"properties":{"config_name":"linux_android_emulator_api_33","dependencies":"[\n  {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"runIf":[".ci.yaml","ci/builders/linux_android_emulator_api_33.json","DEPS","lib/ui/**","shell/platform/android/**","testing/scenario_app/**"],"enabledBranches":["main"],"recipe":"engine_v2/engine_v2"},{"name":"Linux builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n  \"builder\",\n  \"git\"\n]","gclient_variables":"{\n  \"download_emsdk\": \"true\",\n  \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Windows builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n  \"builder\",\n  \"git\"\n]","gclient_variables":"{\n  \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Mac builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n  \"builder\",\n  \"git\"\n]","ignore_cache_paths":"[\n  \"builder/src/flutter/prebuilts/SDKs\",\n  \"builder/src/flutter/prebuilts/Library\"\n]","gclient_variables":"{\n  \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Linux linux_benchmarks","timeout":60,"properties":{"config_name":"linux_benchmarks"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/builder"},{"name":"Linux linux_fuchsia","timeout":60,"properties":{"release_build":"true","config_name":"linux_fuchsia"},"recipe":"engine_v2/engine_v2","dimensions":{"kvm":"1"},"droneDimensions":["os=Linux"]},{"name":"Linux Framework Smoke Tests","timeout":60,"properties":{"gclient_variables":"{\"use_rbe\": true}"},"enabledBranches":["main"],"recipe":"engine/framework_smoke"},{"name":"Linux linux_clang_tidy","timeout":120,"properties":{"config_name":"linux_clang_tidy"},"runIf":["DEPS",".ci.yaml","tools/clang_tidy/**","ci/builders/**","ci/clang_tidy.sh","**.h","**.c","**.cc","**.fbs","**.frag","**.vert"],"recipe":"engine_v2/engine_v2"},{"name":"Linux linux_arm_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_arm_host_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_host_engine","dependencies":"[\n  {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_host_desktop_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_host_desktop_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_android_aot_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_android_debug_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_android_debug_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_license","timeout":120,"properties":{"add_recipes_cq":"true","config_name":"linux_license","clobber":"true"},"recipe":"engine_v2/builder"},{"name":"Linux linux_web_engine","timeout":120,"properties":{"release_build":"true","config_name":"linux_web_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_unopt","timeout":120,"properties":{"config_name":"linux_unopt"},"recipe":"engine_v2/engine_v2"},{"name":"Linux Web Framework tests","timeout":60,"properties":{"add_recipes_cq":"true","cores":"32","gclient_variables":"{\"download_emsdk\": true}","dependencies":"[\n  {\"dependency\": \"chrome_and_driver\", \"version\": \"version:119.0.6045.9\"},\n  {\"dependency\": \"curl\", \"version\": \"version:7.64.0\"}\n]","framework":"true","no_goma":"true","drone_dimensions":"[\"device_type=none\", \"os=Linux\"]\n","shard":"web_tests","subshards":"[\"0\", \"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7_last\"]"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"enabledBranches":["main"],"recipe":"engine/web_engine_framework"},{"name":"Linux mac_android_aot_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"mac_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Mac mac_clang_tidy","timeout":120,"properties":{"config_name":"mac_clang_tidy"},"runIf":["DEPS",".ci.yaml","tools/clang_tidy/**","ci/builders/**","ci/clang_tidy.sh","**.h","**.c","**.cc","**.fbs","**.frag","**.vert","**.m","**.mm"],"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_host_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","cpu":"arm64","config_name":"mac_host_engine","dependencies":"[\n  {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]","$flutter/osx_sdk":"{\n  \"sdk_version\": \"15a240d\"\n}"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Mac-13"]},{"name":"Linux mac_unopt","timeout":120,"properties":{"config_name":"mac_unopt","add_recipes_cq":"true"},"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_ios_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"mac_ios_engine","$flutter/osx_sdk":"{\n  \"sdk_version\": \"15a240d\"\n}"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Mac-13","cpu=x86"]},{"name":"Mac impeller-cmake-example","bringup":true,"timeout":60,"properties":{"cpu":"arm64","config_name":"mac_impeller_cmake_example"},"recipe":"engine_v2/engine_v2"},{"name":"Windows windows_android_aot_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"windows_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"windows_host_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_arm_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","config_name":"windows_arm_host_engine"},"enabledBranches":["main"],"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_unopt","timeout":120,"properties":{"config_name":"windows_unopt"},"recipe":"engine_v2/builder"},{"name":"Linux ci_yaml engine roller","bringup":true,"properties":{"backfill":"false"},"recipe":"infra/ci_yaml"}],"enabledBranches":["main","flutter-\\d+\\.\\d+-candidate\\.\\d+","fuchsia_r\\d+[a-z]*"],"platformProperties":{"linux":{"properties":{"dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:17\"},\n  {\"dependency\": \"gradle_cache\", \"version\": \"none\"}\n]","device_type":"none","os":"Ubuntu","cores":"8"}},"mac":{"properties":{"dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:17\"}\n]","device_type":"none","os":"Mac-13","$flutter/osx_sdk":"{\n  \"sdk_version\": \"15a240d\"\n}"}},"windows":{"properties":{"dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:17\"}\n]","device_type":"none","os":"Windows-10"}}}}
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 5f8e345..25508b7 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -5454,6 +5454,109 @@
       }
     }
     builders {
+      name: "Linux linux_android_emulator_opengles_tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "device_type:none"
+      dimensions: "os:Ubuntu"
+      dimensions: "pool:luci.flutter.prod"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$flutter/goma": {'
+        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+        '  },'
+        '  "$flutter/rbe": {'
+        '    "instance": "projects/flutter-rbe-prod/instances/default",'
+        '    "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
+        '  },'
+        '  "$kitchen": {'
+        '    "emulate_gce": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bringup": true,'
+        '  "clobber": false,'
+        '  "config_name": "linux_android_emulator_opengles",'
+        '  "cores": 8,'
+        '  "dependencies": ['
+        '    {'
+        '      "dependency": "goldctl",'
+        '      "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"'
+        '    },'
+        '    {'
+        '      "dependency": "open_jdk",'
+        '      "version": "version:17"'
+        '    },'
+        '    {'
+        '      "dependency": "gradle_cache",'
+        '      "version": "none"'
+        '    }'
+        '  ],'
+        '  "device_type": "none",'
+        '  "gcs_goldens_bucket": "",'
+        '  "git_branch": "main",'
+        '  "git_repo": "engine",'
+        '  "gold_tryjob": false,'
+        '  "goma_jobs": "200",'
+        '  "mastername": "client.flutter",'
+        '  "os": "Ubuntu",'
+        '  "rbe_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2",'
+        '  "upload_packages": true,'
+        '  "use_cas": true'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      caches {
+        name: "engine_main_builder"
+        path: "builder"
+      }
+      caches {
+        name: "engine_main_git"
+        path: "git"
+      }
+      caches {
+        name: "engine_main_goldctl_git_revision_720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        path: "goldctl"
+      }
+      caches {
+        name: "engine_main_gradle_cache_none"
+        path: "gradle_cache"
+      }
+      caches {
+        name: "engine_main_open_jdk_version_17"
+        path: "open_jdk"
+      }
+      caches {
+        name: "engine_main_open_jdk_version_17_legacy"
+        path: "java"
+      }
+      caches {
+        name: "gradle"
+        path: "gradle"
+      }
+      caches {
+        name: "pub_cache"
+        path: ".pub-cache"
+      }
+      build_numbers: YES
+      service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {}
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "Linux linux_android_emulator_tests"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
@@ -65203,6 +65306,110 @@
       }
     }
     builders {
+      name: "Linux linux_android_emulator_opengles_tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "device_type:none"
+      dimensions: "os:Ubuntu"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$flutter/goma": {'
+        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+        '  },'
+        '  "$flutter/rbe": {'
+        '    "instance": "projects/flutter-rbe-prod/instances/default",'
+        '    "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
+        '  },'
+        '  "$kitchen": {'
+        '    "emulate_gce": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bringup": true,'
+        '  "clobber": false,'
+        '  "config_name": "linux_android_emulator_opengles",'
+        '  "cores": 8,'
+        '  "dependencies": ['
+        '    {'
+        '      "dependency": "goldctl",'
+        '      "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"'
+        '    },'
+        '    {'
+        '      "dependency": "open_jdk",'
+        '      "version": "version:17"'
+        '    },'
+        '    {'
+        '      "dependency": "gradle_cache",'
+        '      "version": "none"'
+        '    }'
+        '  ],'
+        '  "device_type": "none",'
+        '  "gcs_goldens_bucket": "",'
+        '  "git_branch": "main",'
+        '  "git_repo": "engine",'
+        '  "gold_tryjob": false,'
+        '  "goma_jobs": "200",'
+        '  "mastername": "client.flutter",'
+        '  "os": "Ubuntu",'
+        '  "rbe_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2",'
+        '  "upload_packages": true,'
+        '  "use_cas": true'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      expiration_secs: 86400
+      caches {
+        name: "engine_main_builder"
+        path: "builder"
+      }
+      caches {
+        name: "engine_main_git"
+        path: "git"
+      }
+      caches {
+        name: "engine_main_goldctl_git_revision_720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        path: "goldctl"
+      }
+      caches {
+        name: "engine_main_gradle_cache_none"
+        path: "gradle_cache"
+      }
+      caches {
+        name: "engine_main_open_jdk_version_17"
+        path: "open_jdk"
+      }
+      caches {
+        name: "engine_main_open_jdk_version_17_legacy"
+        path: "java"
+      }
+      caches {
+        name: "gradle"
+        path: "gradle"
+      }
+      caches {
+        name: "pub_cache"
+        path: ".pub-cache"
+      }
+      build_numbers: YES
+      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {}
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "Linux linux_android_emulator_tests"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
@@ -124631,6 +124838,109 @@
       }
     }
     builders {
+      name: "Linux linux_android_emulator_opengles_tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "device_type:none"
+      dimensions: "os:Ubuntu"
+      dimensions: "pool:luci.flutter.try"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$flutter/goma": {'
+        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+        '  },'
+        '  "$flutter/rbe": {'
+        '    "instance": "projects/flutter-rbe-prod/instances/default",'
+        '    "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
+        '  },'
+        '  "$kitchen": {'
+        '    "emulate_gce": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bringup": true,'
+        '  "clobber": false,'
+        '  "config_name": "linux_android_emulator_opengles",'
+        '  "cores": 8,'
+        '  "dependencies": ['
+        '    {'
+        '      "dependency": "goldctl",'
+        '      "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"'
+        '    },'
+        '    {'
+        '      "dependency": "open_jdk",'
+        '      "version": "version:17"'
+        '    },'
+        '    {'
+        '      "dependency": "gradle_cache",'
+        '      "version": "none"'
+        '    }'
+        '  ],'
+        '  "device_type": "none",'
+        '  "gcs_goldens_bucket": "",'
+        '  "git_branch": "main",'
+        '  "git_repo": "engine",'
+        '  "gold_tryjob": true,'
+        '  "goma_jobs": "200",'
+        '  "mastername": "client.flutter",'
+        '  "no_lto": true,'
+        '  "os": "Ubuntu",'
+        '  "rbe_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2",'
+        '  "upload_packages": false,'
+        '  "use_cas": true'
+        '}'
+      execution_timeout_secs: 3600
+      caches {
+        name: "engine_main_builder"
+        path: "builder"
+      }
+      caches {
+        name: "engine_main_git"
+        path: "git"
+      }
+      caches {
+        name: "engine_main_goldctl_git_revision_720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        path: "goldctl"
+      }
+      caches {
+        name: "engine_main_gradle_cache_none"
+        path: "gradle_cache"
+      }
+      caches {
+        name: "engine_main_open_jdk_version_17"
+        path: "open_jdk"
+      }
+      caches {
+        name: "engine_main_open_jdk_version_17_legacy"
+        path: "java"
+      }
+      caches {
+        name: "gradle"
+        path: "gradle"
+      }
+      caches {
+        name: "pub_cache"
+        path: ".pub-cache"
+      }
+      build_numbers: YES
+      service_account: "flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {}
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "Linux linux_android_emulator_tests"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg
index 2175713..6143207 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -5524,6 +5524,9 @@
     name: "buildbucket/luci.flutter.try/Linux linux_android_emulator_tests"
   }
   builders {
+    name: "buildbucket/luci.flutter.try/Linux linux_android_emulator_opengles_tests"
+  }
+  builders {
     name: "buildbucket/luci.flutter.try/Linux linux_android_emulator_tests_api_33"
   }
   builders {
@@ -5634,6 +5637,11 @@
     short_name: "llaet"
   }
   builders {
+    name: "buildbucket/luci.flutter.staging/Linux linux_android_emulator_opengles_tests"
+    category: "Linux"
+    short_name: "llaeo"
+  }
+  builders {
     name: "buildbucket/luci.flutter.staging/Linux linux_android_emulator_tests_api_33"
     category: "Linux"
     short_name: "llaet"
@@ -5787,6 +5795,11 @@
     short_name: "llaet"
   }
   builders {
+    name: "buildbucket/luci.flutter.prod/Linux linux_android_emulator_opengles_tests"
+    category: "Linux"
+    short_name: "llaeo"
+  }
+  builders {
     name: "buildbucket/luci.flutter.prod/Linux linux_android_emulator_tests_api_33"
     category: "Linux"
     short_name: "llaet"
diff --git a/config/generated/flutter/luci/luci-notify.cfg b/config/generated/flutter/luci/luci-notify.cfg
index 82daead..25634e8 100644
--- a/config/generated/flutter/luci/luci-notify.cfg
+++ b/config/generated/flutter/luci/luci-notify.cfg
@@ -168,6 +168,30 @@
   }
   builders {
     bucket: "prod"
+    name: "Linux linux_android_emulator_opengles_tests"
+    repository: "https://flutter.googlesource.com/mirrors/engine"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: INFRA_FAILURE
+    on_occurrence: FAILURE
+    failed_step_regexp: "(^build|.*test:).*"
+    email {
+      recipients: "flutter-engine@grotations.appspotmail.com"
+    }
+    template: "test_build_failure"
+  }
+  notifications {
+    on_occurrence: SUCCESS
+    failed_step_regexp: "(.*test:).*"
+    email {
+      recipients: "flutter-engine@grotations.appspotmail.com"
+    }
+    template: "test_flake"
+  }
+  builders {
+    bucket: "prod"
     name: "Linux linux_android_emulator_tests"
     repository: "https://flutter.googlesource.com/mirrors/engine"
   }
@@ -864,6 +888,30 @@
   }
   builders {
     bucket: "staging"
+    name: "Linux linux_android_emulator_opengles_tests"
+    repository: "https://flutter.googlesource.com/mirrors/engine"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: INFRA_FAILURE
+    on_occurrence: FAILURE
+    failed_step_regexp: "(^build|.*test:).*"
+    email {
+      recipients: "flutter-engine@grotations.appspotmail.com"
+    }
+    template: "test_build_failure"
+  }
+  notifications {
+    on_occurrence: SUCCESS
+    failed_step_regexp: "(.*test:).*"
+    email {
+      recipients: "flutter-engine@grotations.appspotmail.com"
+    }
+    template: "test_flake"
+  }
+  builders {
+    bucket: "staging"
     name: "Linux linux_android_emulator_tests"
     repository: "https://flutter.googlesource.com/mirrors/engine"
   }