diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
index 43b78cee145dc9..b1870473448f1a 100644
--- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml
+++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
@@ -34,8 +34,20 @@ jobs:
       - Windows.10.Amd64.Android.Open
 
     # Android x64
-    - ${{ if in(parameters.platform, 'Android_x64') }}:
+    - ${{ if in(parameters.platform, 'Android_x86', 'Android_x64') }}:
+      - Ubuntu.1804.Amd64.Android.21.Open
+      - Ubuntu.1804.Amd64.Android.22.Open
+      - Ubuntu.1804.Amd64.Android.23.Open
+      - Ubuntu.1804.Amd64.Android.24.Open
+      - Ubuntu.1804.Amd64.Android.25.Open
+      - Ubuntu.1804.Amd64.Android.26.Open
+      - Ubuntu.1804.Amd64.Android.27.Open
+      - Ubuntu.1804.Amd64.Android.28.Open
       - Ubuntu.1804.Amd64.Android.29.Open
+      - Ubuntu.1804.Amd64.Android.30.Open
+    - ${{ if in(parameters.platform, 'Android_x64') }}: # there's no x86 emulator image anymore since Android 31
+      - Ubuntu.1804.Amd64.Android.31.Open
+      - Ubuntu.1804.Amd64.Android.32.Open
 
     # Browser wasm
     - ${{ if eq(parameters.platform, 'Browser_wasm') }}:
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index 72b370a9131623..c7bcb462a90054 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -97,7 +97,19 @@ jobs:
 
     # Android
     - ${{ if in(parameters.platform, 'Android_x86', 'Android_x64') }}:
+      - Ubuntu.1804.Amd64.Android.21.Open
+      - Ubuntu.1804.Amd64.Android.22.Open
+      - Ubuntu.1804.Amd64.Android.23.Open
+      - Ubuntu.1804.Amd64.Android.24.Open
+      - Ubuntu.1804.Amd64.Android.25.Open
+      - Ubuntu.1804.Amd64.Android.26.Open
+      - Ubuntu.1804.Amd64.Android.27.Open
+      - Ubuntu.1804.Amd64.Android.28.Open
       - Ubuntu.1804.Amd64.Android.29.Open
+      - Ubuntu.1804.Amd64.Android.30.Open
+    - ${{ if in(parameters.platform, 'Android_x64') }}: # there's no x86 emulator image anymore since Android 31
+      - Ubuntu.1804.Amd64.Android.31.Open
+      - Ubuntu.1804.Amd64.Android.32.Open
     - ${{ if in(parameters.platform, 'Android_arm', 'Android_arm64') }}:
       - Windows.10.Amd64.Android.Open
 
diff --git a/eng/pipelines/runtime-extra-platforms.yml b/eng/pipelines/runtime-extra-platforms.yml
index 02591d91b6b0e3..f0baabe9b243a8 100644
--- a/eng/pipelines/runtime-extra-platforms.yml
+++ b/eng/pipelines/runtime-extra-platforms.yml
@@ -35,13 +35,55 @@ jobs:
   - template: /eng/pipelines/common/evaluate-default-paths.yml
 
 # include this unconditionally, because it has per job conditions
-- template: /eng/pipelines/runtime-extra-platforms-wasm.yml
-  parameters:
-    isWasmOnlyBuild: ${{ variables.isWasmOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+#- template: /eng/pipelines/runtime-extra-platforms-wasm.yml
+#  parameters:
+#    isWasmOnlyBuild: ${{ variables.isWasmOnlyBuild }}
+#    isRollingBuild: ${{ variables.isRollingBuild }}
 
 # Any jobs that are not specific to any platform
-- ${{ if eq(variables.isNotSpecificPlatformOnlyBuild, true) }}:
-  - template: /eng/pipelines/runtime-extra-platforms-other.yml
-    parameters:
-      isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+#- ${{ if eq(variables.isNotSpecificPlatformOnlyBuild, true) }}:
+#  - template: /eng/pipelines/runtime-extra-platforms-other.yml
+#    parameters:
+#      isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+
+#
+# Android emulators
+# Build the whole product using Mono and run libraries tests
+#
+
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/common/global-build-job.yml
+    helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+    buildConfig: Release
+    runtimeFlavor: mono
+    platforms:
+    - Android_x86
+    - Android_x64
+    variables:
+      # map dependencies variables to local variables
+      - name: librariesContainsChange
+        value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
+      - name: monoContainsChange
+        value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
+    jobParameters:
+      testGroup: innerloop
+      nameSuffix: AllSubsets_Mono
+      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true # $(_runSmokeTestsOnlyArg)
+      timeoutInMinutes: 1800
+      condition: >-
+        or(
+          eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
+          eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
+          eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
+          eq(variables['isRollingBuild'], true))
+      # extra steps, run tests
+      extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+      extraStepsParameters:
+        creator: dotnet-bot
+        testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+        condition: >-
+          or(
+          eq(variables['librariesContainsChange'], true),
+          eq(variables['monoContainsChange'], true),
+          eq(variables['isRollingBuild'], true))
\ No newline at end of file